diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2017-09-14 16:16:22 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-14 16:16:22 +0800 |
| commit | 1739e84ac02c0384c04576a00abab9348293f9c7 (patch) | |
| tree | 1015e68f36421f274d2e883ff3ddb0cb29b6af71 /routers/routes | |
| parent | be3319b3d545289b772d7a92b4b62205863954d9 (diff) | |
| download | gitea-1739e84ac02c0384c04576a00abab9348293f9c7.tar.gz gitea-1739e84ac02c0384c04576a00abab9348293f9c7.zip | |
improve protected branch to add whitelist support (#2451)
* improve protected branch to add whitelist support
* fix lint
* fix style check
* fix tests
* fix description on UI and import
* fix test
* bug fixed
* fix tests and languages
* move isSliceInt64Eq to util pkg; improve function names & typo
Diffstat (limited to 'routers/routes')
| -rw-r--r-- | routers/routes/routes.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/routers/routes/routes.go b/routers/routes/routes.go index 938dec1dcf..067bf6a7f6 100644 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -433,8 +433,8 @@ func RegisterRoutes(m *macaron.Macaron) { }) m.Group("/branches", func() { m.Combo("").Get(repo.ProtectedBranch).Post(repo.ProtectedBranchPost) - m.Post("/can_push", repo.ChangeProtectedBranch) - m.Post("/delete", repo.DeleteProtectedBranch) + m.Combo("/*").Get(repo.SettingsProtectedBranch). + Post(bindIgnErr(auth.ProtectBranchForm{}), repo.SettingsProtectedBranchPost) }, repo.MustBeNotBare) m.Group("/hooks", func() { |