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 /options | |
| 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 'options')
| -rw-r--r-- | options/locale/locale_en-US.ini | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 40cb209421..0bc8309ff8 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1028,6 +1028,10 @@ settings.protect_whitelist_users = Users who can push to this branch settings.protect_whitelist_search_users = Search users settings.protect_whitelist_teams = Teams whose members can push to this branch. settings.protect_whitelist_search_teams = Search teams +settings.protect_merge_whitelist_committers = Restrict who can merge pull requests to this branch +settings.protect_merge_whitelist_committers_desc = Add users or teams to this branch's merge whitelist. Only whitelisted users can merge pull requests to this branch. If not checked, anyone with write permissions can merge pull requests to this branch. +settings.protect_merge_whitelist_users = Users who can merge pull requests to this branch +settings.protect_merge_whitelist_teams = Teams whose members can merge pull requests to this branch. settings.add_protected_branch=Enable protection settings.delete_protected_branch=Disable protection settings.update_protect_branch_success = Branch %s protect options changed successfully. |