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 /options | |
| 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 'options')
| -rw-r--r-- | options/locale/locale_en-US.ini | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index f43badaab2..949f560a33 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -945,11 +945,19 @@ settings.protected_branch=Branch Protection settings.protected_branch_can_push=Allow push? settings.protected_branch_can_push_yes=You can push settings.protected_branch_can_push_no=You can not push +settings.branch_protection = Branch Protection for <b>%s</b> +settings.protect_this_branch = Protect this branch +settings.protect_this_branch_desc = Disable force pushes and prevent deletion. +settings.protect_whitelist_committers = Whitelist who can push to this branch +settings.protect_whitelist_committers_desc = Add users or teams to this branch's whitelist. Whitelisted users bypass the typical push restrictions. +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.add_protected_branch=Enable protection settings.delete_protected_branch=Disable protection -settings.add_protected_branch_success=%s Locked successfully -settings.add_protected_branch_failed= %s Locked failed -settings.remove_protected_branch_success=%s Unlocked successfully +settings.update_protect_branch_success = Branch %s protect options changed successfully. +settings.remove_protected_branch_success= Branch %s protect options removed successfully settings.protected_branch_deletion=To delete a protected branch settings.protected_branch_deletion_desc=Anyone with write permissions will be able to push directly to this branch. Are you sure? settings.default_branch_desc = The default branch is considered the "base" branch in your repository against which all pull requests and code commits are automatically made, unless you specify a different branch. |