diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2019-04-04 10:05:57 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-04-04 10:05:57 +0000 |
| commit | 1be7f5aaa38aba79843eae8835be6c99c025e982 (patch) | |
| tree | 565db8837f77f5faee42e07fe285a9ad290152c6 /doc | |
| parent | 7aa26dee605ff90a143d7bbbf637a1855cba1dbb (diff) | |
| parent | 2339ea0b8ac28cf117807ca1b85091355d29f79f (diff) | |
| download | gitlab-ce-1be7f5aaa38aba79843eae8835be6c99c025e982.tar.gz | |
Merge branch '59979-update-documentation-about-only-allow-merge-requests-to-be-merged-if-the-pipeline-succeeds-to-take-into-account-the-settings-page-reorganization' into 'master'
Update "Pipelines must succeed" documentation
Closes #59979
See merge request gitlab-org/gitlab-ce!26945
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/user/project/merge_requests/img/merge_when_pipeline_succeeds_only_if_succeeds_settings.png | bin | 6491 -> 19986 bytes | |||
| -rw-r--r-- | doc/user/project/merge_requests/merge_when_pipeline_succeeds.md | 8 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/user/project/merge_requests/img/merge_when_pipeline_succeeds_only_if_succeeds_settings.png b/doc/user/project/merge_requests/img/merge_when_pipeline_succeeds_only_if_succeeds_settings.png Binary files differindex 2a2101719ba..ea3aff59aa1 100644 --- a/doc/user/project/merge_requests/img/merge_when_pipeline_succeeds_only_if_succeeds_settings.png +++ b/doc/user/project/merge_requests/img/merge_when_pipeline_succeeds_only_if_succeeds_settings.png 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 f8af71ab46b..1477e35dca8 100644 --- a/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md +++ b/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md @@ -35,11 +35,11 @@ You need to have jobs configured to enable this feature. You can prevent merge requests from being merged if their pipeline did not succeed or if there are discussions to be resolved. -Navigate to your project's settings page, select the -**Only allow merge requests to be merged if the pipeline succeeds** check box and -hit **Save** for the changes to take effect. +Navigate to your project's settings page and expand the **Merge requests** section. +In the **Merge checks** subsection, select the **Pipelines must succeed** check +box and hit **Save** for the changes to take effect. - +  From now on, every time the pipeline fails you will not be able to merge the merge request from the UI, until you make all relevant jobs pass. |
