summaryrefslogtreecommitdiff
path: root/app/views/projects/_merge_request_merge_settings.html.haml
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2017-09-05 16:49:05 +0100
committerSean McGivern <sean@gitlab.com>2017-09-06 10:08:03 +0100
commite8f29569bcb4a2d732a2c00b34958f58d5622836 (patch)
tree41b69a559246c423699c741d2f9f252911a2e525 /app/views/projects/_merge_request_merge_settings.html.haml
parentac816d90d4cc116117497479f400211a43db6be1 (diff)
downloadgitlab-ce-e8f29569bcb4a2d732a2c00b34958f58d5622836.tar.gz
Resolve outdated diff discussions on push
Diffstat (limited to 'app/views/projects/_merge_request_merge_settings.html.haml')
-rw-r--r--app/views/projects/_merge_request_merge_settings.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/_merge_request_merge_settings.html.haml b/app/views/projects/_merge_request_merge_settings.html.haml
index c1cb3b07d8e..e3effe45d6c 100644
--- a/app/views/projects/_merge_request_merge_settings.html.haml
+++ b/app/views/projects/_merge_request_merge_settings.html.haml
@@ -16,7 +16,7 @@
.checkbox
= form.label :resolve_outdated_diff_discussions do
= form.check_box :resolve_outdated_diff_discussions
- %strong Automatically resolve merge request diffs discussions on lines changed with a push
+ %strong Automatically resolve merge request diff discussions when they become outdated
.checkbox
= form.label :printing_merge_request_link_enabled do
= form.check_box :printing_merge_request_link_enabled