diff options
| author | Chri-s <Chri-s@users.noreply.github.com> | 2018-03-25 12:01:32 +0200 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2018-03-25 13:01:32 +0300 |
| commit | 9350ba7947d8caa6e7338d7c9e54df2f3aef2146 (patch) | |
| tree | e40e1f9810c03221073742040c7fc2c93b3b7546 /modules | |
| parent | 04b7fd87b9d74aa6a0c559ac218546978bbf6f33 (diff) | |
| download | gitea-9350ba7947d8caa6e7338d7c9e54df2f3aef2146.tar.gz gitea-9350ba7947d8caa6e7338d7c9e54df2f3aef2146.zip | |
Add protected branch whitelists for merging (#3689)
* Add database migrations for merge whitelist
* Add merge whitelist settings for protected branches
* Add checks for merge whitelists
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/auth/repo_form.go | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/modules/auth/repo_form.go b/modules/auth/repo_form.go index abe25866b6..565428c350 100644 --- a/modules/auth/repo_form.go +++ b/modules/auth/repo_form.go @@ -129,10 +129,13 @@ func (f *RepoSettingForm) Validate(ctx *macaron.Context, errs binding.Errors) bi // ProtectBranchForm form for changing protected branch settings type ProtectBranchForm struct { - Protected bool - EnableWhitelist bool - WhitelistUsers string - WhitelistTeams string + Protected bool + EnableWhitelist bool + WhitelistUsers string + WhitelistTeams string + EnableMergeWhitelist bool + MergeWhitelistUsers string + MergeWhitelistTeams string } // Validate validates the fields |