diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-11-21 11:27:28 +0100 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-11-21 11:27:28 +0100 |
| commit | c6a4f9fc5b98024d4af872b0009b90c36bc2e595 (patch) | |
| tree | c945102da813fb098bdbdaeb65bd6fc5cb69b72e /doc/user/project/merge_requests.md | |
| parent | d07ef089c8870b4a5a1c69555c54c93ff1f1fa24 (diff) | |
| download | gitlab-ce-c6a4f9fc5b98024d4af872b0009b90c36bc2e595.tar.gz | |
Update some docs to reflect MWPS name change
Diffstat (limited to 'doc/user/project/merge_requests.md')
| -rw-r--r-- | doc/user/project/merge_requests.md | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/user/project/merge_requests.md b/doc/user/project/merge_requests.md index 5af9a5d049c..e76428d41f3 100644 --- a/doc/user/project/merge_requests.md +++ b/doc/user/project/merge_requests.md @@ -19,14 +19,14 @@ in a merged merge requests or a commit. [Learn more about cherry-picking changes.](merge_requests/cherry_pick_changes.md) -## Merge when build succeeds +## Merge when pipeline succeeds When reviewing a merge request that looks ready to merge but still has one or -more CI builds running, you can set it to be merged automatically when all -builds succeed. This way, you don't have to wait for the builds to finish and -remember to merge the request manually. +more CI builds running, you can set it to be merged automatically when CI +pipeline succeeds. This way, you don't have to wait for the pipeline to finish +and remember to merge the request manually. -[Learn more about merging when build succeeds.](merge_requests/merge_when_build_succeeds.md) +[Learn more about merging when pipeline succeeds.](merge_requests/merge_when_build_succeeds.md) ## Resolve discussion comments in merge requests reviews |