diff options
Diffstat (limited to 'cmd/web.go')
| -rw-r--r-- | cmd/web.go | 29 |
1 files changed, 20 insertions, 9 deletions
@@ -435,10 +435,21 @@ func runWeb(ctx *cli.Context) error { m.Combo("").Get(repo.Settings). Post(bindIgnErr(auth.RepoSettingForm{}), repo.SettingsPost) m.Group("/collaboration", func() { - m.Combo("").Get(repo.Collaboration).Post(repo.CollaborationPost) + m.Combo("").Get(repo.SettingsCollaboration).Post(repo.SettingsCollaborationPost) m.Post("/access_mode", repo.ChangeCollaborationAccessMode) m.Post("/delete", repo.DeleteCollaboration) }) + m.Group("/branches", func() { + m.Get("", repo.SettingsBranches) + m.Post("/default_branch", repo.UpdateDefaultBranch) + m.Combo("/*").Get(repo.SettingsProtectedBranch). + Post(bindIgnErr(auth.ProtectBranchForm{}), repo.SettingsProtectedBranchPost) + }, func(ctx *context.Context) { + if ctx.Repo.Repository.IsMirror { + ctx.NotFound() + return + } + }) m.Group("/hooks", func() { m.Get("", repo.Webhooks) @@ -452,15 +463,15 @@ func runWeb(ctx *cli.Context) error { m.Post("/slack/:id", bindIgnErr(auth.NewSlackHookForm{}), repo.SlackHooksEditPost) m.Group("/git", func() { - m.Get("", repo.GitHooks) - m.Combo("/:name").Get(repo.GitHooksEdit). - Post(repo.GitHooksEditPost) + m.Get("", repo.SettingsGitHooks) + m.Combo("/:name").Get(repo.SettingsGitHooksEdit). + Post(repo.SettingsGitHooksEditPost) }, context.GitHookService()) }) m.Group("/keys", func() { - m.Combo("").Get(repo.DeployKeys). - Post(bindIgnErr(auth.AddSSHKeyForm{}), repo.DeployKeysPost) + m.Combo("").Get(repo.SettingsDeployKeys). + Post(bindIgnErr(auth.AddSSHKeyForm{}), repo.SettingsDeployKeysPost) m.Post("/delete", repo.DeleteDeployKey) }) @@ -555,13 +566,13 @@ func runWeb(ctx *cli.Context) error { m.Post("/upload-remove", bindIgnErr(auth.RemoveUploadFileForm{}), repo.RemoveUploadFileFromServer) }, func(ctx *context.Context) { if !setting.Repository.Upload.Enabled { - ctx.Handle(404, "", nil) + ctx.NotFound() return } }) }, reqRepoWriter, context.RepoRef(), func(ctx *context.Context) { - if !ctx.Repo.Repository.CanEnableEditor() || ctx.Repo.IsViewCommit { - ctx.Handle(404, "", nil) + if !ctx.Repo.CanEnableEditor() { + ctx.NotFound() return } }) |