aboutsummaryrefslogtreecommitdiff
path: root/conf/locale
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2017-03-08 16:43:36 -0500
committerUnknwon <u@gogs.io>2017-03-08 16:43:36 -0500
commit83f6b8e8474248bdad48aef5173695734d5fe5bc (patch)
treeeb4465dd079cd5a5dd6a47c0e6ede22b6fda72db /conf/locale
parente38fef00094fb114ae6f345e2159bae5059c49db (diff)
Protected branches: allow whitelist bypass require pull request check (#4207)
Diffstat (limited to 'conf/locale')
-rw-r--r--conf/locale/locale_en-US.ini2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini
index bf18e857..72c705a4 100644
--- a/conf/locale/locale_en-US.ini
+++ b/conf/locale/locale_en-US.ini
@@ -656,7 +656,7 @@ settings.protect_this_branch_desc = Disable force pushes and prevent from deleti
settings.protect_require_pull_request = Require pull request instead direct pushing
settings.protect_require_pull_request_desc = Enable this option to disable direct pushing to this branch. Commits have to be pushed to another non-protected branch and merged to this branch through pull request.
settings.protect_whitelist_committers = Whitelist who can push to this branch
-settings.protect_whitelist_committers_desc = Add people or teams to whitelist of direct push to this branch.
+settings.protect_whitelist_committers_desc = Add people or teams to whitelist of direct push to this branch. Users in whitelist will bypass require pull request check.
settings.protect_whitelist_users = Users who can push to this branch
settings.protect_whitelist_search_users = Search users
settings.protect_whitelist_teams = Teams for which members of them can push to this branch