summaryrefslogtreecommitdiff
path: root/doc/development
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2016-12-05 11:07:57 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2016-12-05 11:07:57 +0000
commit0f90fd639c9ed387426e0a8ec3a23ac33b37024c (patch)
treefe5951138e06bfcccd4f2474ef773078896e2f0e /doc/development
parentca075c918a2eceaa02fa8b2ff2da4434c0900b2d (diff)
parent4681ab1df1c3d05af58335dd065ae1834aab5d35 (diff)
downloadgitlab-ce-0f90fd639c9ed387426e0a8ec3a23ac33b37024c.tar.gz
Merge branch 'fix/rename-mwbs-to-merge-when-pipeline-succeeds' into 'master'
Rename MWBS service to Merge When Pipeline Succeeds ## What does this MR do? This MR renames Merge When Build Succeeds feature to Merge When Pipeline Succeeds, because we recently changed the behavior, see https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6675. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] All builds are passing ## What are the relevant issue numbers? Closes #23354 See merge request !7135
Diffstat (limited to 'doc/development')
-rw-r--r--doc/development/code_review.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/development/code_review.md b/doc/development/code_review.md
index e1fb8102b67..1ef34c79971 100644
--- a/doc/development/code_review.md
+++ b/doc/development/code_review.md
@@ -70,8 +70,8 @@ experience, refactors the existing code). Then:
- After a round of line notes, it can be helpful to post a summary note such as
"LGTM :thumbsup:", or "Just a couple things to address."
- Avoid accepting a merge request before the build succeeds. Of course, "Merge
- When Build Succeeds" (MWBS) is fine.
-- If you set the MR to "Merge When Build Succeeds", you should take over
+ When Pipeline Succeeds" (MWPS) is fine.
+- If you set the MR to "Merge When Pipeline Succeeds", you should take over
subsequent revisions for anything that would be spotted after that.
## The right balance