diff options
| author | Matthias Loibl <mail@matthiasloibl.com> | 2016-11-05 19:01:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-05 19:01:20 +0100 |
| commit | a0e54c0512a764ab0f93eb2ee6b978fb736190b4 (patch) | |
| tree | 784e84c939367a64b5bd5a7322a801dd83108642 /cmd | |
| parent | 91b589f2f0fb93f9f9882426c43c363276d2235a (diff) | |
| parent | bd898a10f888005be990ebea2e6a845d09ef55f3 (diff) | |
| download | gitea-a0e54c0512a764ab0f93eb2ee6b978fb736190b4.tar.gz gitea-a0e54c0512a764ab0f93eb2ee6b978fb736190b4.zip | |
Merge pull request #84 from andreynering/gitea/fix-500-on-invalid-editorconfig
Refactor editorconfig middleware
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/web.go | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/cmd/web.go b/cmd/web.go index a43dae38f3..d80c2096c5 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -520,7 +520,8 @@ func runWeb(ctx *cli.Context) error { ctx.Data["CommitsCount"] = ctx.Repo.CommitsCount }) - m.Combo("/compare/*", repo.MustAllowPulls).Get(repo.CompareAndPullRequest). + m.Combo("/compare/*", repo.MustAllowPulls, repo.SetEditorconfigIfExists). + Get(repo.CompareAndPullRequest). Post(bindIgnErr(auth.CreateIssueForm{}), repo.CompareAndPullRequestPost) m.Group("", func() { @@ -579,15 +580,15 @@ func runWeb(ctx *cli.Context) error { m.Group("/pulls/:index", func() { m.Get("/commits", context.RepoRef(), repo.ViewPullCommits) - m.Get("/files", context.RepoRef(), repo.ViewPullFiles) + m.Get("/files", context.RepoRef(), repo.SetEditorconfigIfExists, repo.ViewPullFiles) m.Post("/merge", reqRepoWriter, repo.MergePullRequest) }, repo.MustAllowPulls) m.Group("", func() { - m.Get("/src/*", repo.Home) + m.Get("/src/*", repo.SetEditorconfigIfExists, repo.Home) m.Get("/raw/*", repo.SingleDownload) m.Get("/commits/*", repo.RefCommits) - m.Get("/commit/:sha([a-f0-9]{7,40})$", repo.Diff) + m.Get("/commit/:sha([a-f0-9]{7,40})$", repo.SetEditorconfigIfExists, repo.Diff) m.Get("/forks", repo.Forks) }, context.RepoRef()) m.Get("/commit/:sha([a-f0-9]{7,40})\\.:ext(patch|diff)", repo.RawDiff) @@ -601,8 +602,8 @@ func runWeb(ctx *cli.Context) error { m.Group("/:username", func() { m.Group("/:reponame", func() { - m.Get("", repo.Home) - m.Get("\\.git$", repo.Home) + m.Get("", repo.SetEditorconfigIfExists, repo.Home) + m.Get("\\.git$", repo.SetEditorconfigIfExists, repo.Home) }, ignSignIn, context.RepoAssignment(true), context.RepoRef()) m.Group("/:reponame", func() { |