summaryrefslogtreecommitdiff
path: root/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md
diff options
context:
space:
mode:
authorGreg Myers <gmyers@gitlab.com>2019-08-27 15:51:04 +0000
committerGreg Myers <gmyers@gitlab.com>2019-08-27 15:51:04 +0000
commit51a0166af2c532aa7a0d04bb503b43499be97033 (patch)
tree9ebd74e8518d573fe4860763ddb41146dab1f453 /doc/user/project/merge_requests/merge_when_pipeline_succeeds.md
parentf706677357fcdf9cd870d098379788543ea71058 (diff)
parent27c222d16ccb666878c7ac558f484efa56f77f37 (diff)
downloadgitlab-ce-51a0166af2c532aa7a0d04bb503b43499be97033.tar.gz
Merge branch 'master' into 'api-curl-quote-url-docs'api-curl-quote-url-docs
# Conflicts: # doc/api/events.md
Diffstat (limited to 'doc/user/project/merge_requests/merge_when_pipeline_succeeds.md')
-rw-r--r--doc/user/project/merge_requests/merge_when_pipeline_succeeds.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md b/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md
index 0dd60d84c42..50a4e514d49 100644
--- a/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md
+++ b/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md
@@ -36,7 +36,7 @@ changes to be reviewed.
## Only allow merge requests to be merged if the pipeline succeeds
You can prevent merge requests from being merged if their pipeline did not succeed
-or if there are discussions to be resolved.
+or if there are threads to be resolved.
Navigate to your project's settings page and expand the **Merge requests** section.
In the **Merge checks** subsection, select the **Pipelines must succeed** check