summaryrefslogtreecommitdiff
path: root/doc/workflow
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-11-21 11:27:28 +0100
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-11-21 11:27:28 +0100
commitc6a4f9fc5b98024d4af872b0009b90c36bc2e595 (patch)
treec945102da813fb098bdbdaeb65bd6fc5cb69b72e /doc/workflow
parentd07ef089c8870b4a5a1c69555c54c93ff1f1fa24 (diff)
downloadgitlab-ce-c6a4f9fc5b98024d4af872b0009b90c36bc2e595.tar.gz
Update some docs to reflect MWPS name change
Diffstat (limited to 'doc/workflow')
-rw-r--r--doc/workflow/README.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/workflow/README.md b/doc/workflow/README.md
index 2d9bfbc0629..57a0d21c7a7 100644
--- a/doc/workflow/README.md
+++ b/doc/workflow/README.md
@@ -25,7 +25,7 @@
- [Merge Requests](../user/project/merge_requests.md)
- [Authorization for merge requests](../user/project/merge_requests/authorization_for_merge_requests.md)
- [Cherry-pick changes](../user/project/merge_requests/cherry_pick_changes.md)
- - [Merge when build succeeds](../user/project/merge_requests/merge_when_build_succeeds.md)
+ - [Merge when pipeline succeeds](../user/project/merge_requests/merge_when_build_succeeds.md)
- [Resolve discussion comments in merge requests reviews](../user/project/merge_requests/merge_request_discussion_resolution.md)
- [Resolve merge conflicts in the UI](../user/project/merge_requests/resolve_conflicts.md)
- [Revert changes in the UI](../user/project/merge_requests/revert_changes.md)