diff options
| author | Unknwon <joe2010xtmf@163.com> | 2014-08-07 06:40:05 -0400 |
|---|---|---|
| committer | Unknwon <joe2010xtmf@163.com> | 2014-08-07 06:40:05 -0400 |
| commit | e8c9bb2c66a1f48820a93b670c2e6e67da94b354 (patch) | |
| tree | 372f7d3c44e0d3d2f2b7527e482c5cece05ebfee /cmd | |
| parent | 99eeb08419e63474b4e9d6581335f693d26c0e69 (diff) | |
| download | gitea-e8c9bb2c66a1f48820a93b670c2e6e67da94b354.tar.gz gitea-e8c9bb2c66a1f48820a93b670c2e6e67da94b354.zip | |
Finish new collaboration page
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/web.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cmd/web.go b/cmd/web.go index 8d39ce64c8..40ae760280 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -96,7 +96,6 @@ func newMacaron() *macaron.Macaron { Secret: setting.SecretKey, SetCookie: true, })) - m.Use(middleware.Contexter()) m.Use(toolbox.Toolboxer(m, toolbox.Options{ HealthCheckFuncs: []*toolbox.HealthCheckFuncDesc{ &toolbox.HealthCheckFuncDesc{ @@ -105,6 +104,7 @@ func newMacaron() *macaron.Macaron { }, }, })) + m.Use(middleware.Contexter()) return m } @@ -254,8 +254,7 @@ func runWeb(*cli.Context) { r.Get("/settings", repo.Settings) r.Post("/settings", bindIgnErr(auth.RepoSettingForm{}), repo.SettingsPost) m.Group("/settings", func(r *macaron.Router) { - r.Get("/collaboration", repo.Collaboration) - r.Post("/collaboration", repo.CollaborationPost) + r.Route("/collaboration", "GET,POST", repo.SettingsCollaboration) r.Get("/hooks", repo.WebHooks) r.Get("/hooks/add", repo.WebHooksAdd) r.Post("/hooks/add", bindIgnErr(auth.NewWebhookForm{}), repo.WebHooksAddPost) |