aboutsummaryrefslogtreecommitdiffstats
path: root/options/locale/locale_en-US.ini
diff options
context:
space:
mode:
authorElias Norberg <elias@aisle.se>2019-09-30 04:33:40 +0200
committerLunny Xiao <xiaolunwen@gmail.com>2019-09-30 10:33:40 +0800
commit668d3d02aa0222c839e42bc2608ad1fa05b8640b (patch)
treeaf433d57ee30c76fa12303a873b15a0ed7d4b3b1 /options/locale/locale_en-US.ini
parent0d2566b5608461e782d9e257a731afa753ab4a06 (diff)
downloadgitea-668d3d02aa0222c839e42bc2608ad1fa05b8640b.tar.gz
gitea-668d3d02aa0222c839e42bc2608ad1fa05b8640b.zip
If no specific context is required for status check, require an overall success (#8318)
Signed-off-by: Elias Norberg <elias@aisle.se>
Diffstat (limited to 'options/locale/locale_en-US.ini')
-rw-r--r--options/locale/locale_en-US.ini2
1 files changed, 1 insertions, 1 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 7bb4539684..938c53af3f 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1326,7 +1326,7 @@ settings.protect_merge_whitelist_committers_desc = Allow only whitelisted users
settings.protect_merge_whitelist_users = Whitelisted users for merging:
settings.protect_merge_whitelist_teams = Whitelisted teams for merging:
settings.protect_check_status_contexts = Enable Status Check
-settings.protect_check_status_contexts_desc = Require status checks to pass before merging Choose which status checks must pass before branches can be merged into a branch that matches this rule. When enabled, commits must first be pushed to another branch, then merged or pushed directly to a branch that matches this rule after status checks have passed.
+settings.protect_check_status_contexts_desc = Require status checks to pass before merging Choose which status checks must pass before branches can be merged into a branch that matches this rule. When enabled, commits must first be pushed to another branch, then merged or pushed directly to a branch that matches this rule after status checks have passed. If no contexts are selected, the last commit must be successful regardless of context.
settings.protect_check_status_contexts_list = Status checks found in the last week for this repository
settings.protect_required_approvals = Required approvals:
settings.protect_required_approvals_desc = Allow only to merge pull request with enough positive reviews of whitelisted users or teams.