diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-30 15:10:51 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-30 15:10:51 +0300 |
| commit | a10d237d37e78cbe84f72fffaeff74dc73f1e68f (patch) | |
| tree | a3a820c7d67801605dcbb419d3f38513ee61044c /doc/development/code_review.md | |
| parent | afa3d4e0666ea2cddcf995fadac75c35a75c9b64 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/code_review.md')
| -rw-r--r-- | doc/development/code_review.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/development/code_review.md b/doc/development/code_review.md index 083398a840d..f354d7ccbe9 100644 --- a/doc/development/code_review.md +++ b/doc/development/code_review.md @@ -409,7 +409,7 @@ When ready to merge: - **Start a new merge request pipeline with the `Run Pipeline` button in the merge request's "Pipelines" tab, and enable "Merge When Pipeline Succeeds" (MWPS).** Note that: - If **[master is broken](https://about.gitlab.com/handbook/engineering/workflow/#broken-master), - do not merge the merge request**. Follow these specific [handbook instructions](https://about.gitlab.com/handbook/engineering/workflow/#maintaining-throughput-during-broken-master). + For other cases, follow these [handbook instructions](https://about.gitlab.com/handbook/engineering/workflow/#merging-during-broken-master). - If the **latest [Pipeline for Merged Results](../ci/merge_request_pipelines/pipelines_for_merged_results/#pipelines-for-merged-results)** finished less than 2 hours ago, you might merge without starting a new pipeline as the merge request is close enough to `master`. |