From 4d77056af1ca5532ae8482b362b5ef466a640ae2 Mon Sep 17 00:00:00 2001 From: Achilleas Pipinellis Date: Mon, 5 Sep 2016 14:15:57 +0200 Subject: [PATCH] Move "Only allow merge requests to be merged if the build succeeds" to new location --- .../_merge_request_settings.html.haml | 2 +- doc/user/project/merge_requests.md | 14 ++------------ ...en_build_succeeds_only_if_succeeds_msg.png | Bin 0 -> 11136 bytes ...ld_succeeds_only_if_succeeds_settings.png} | Bin .../merge_when_build_succeeds.md | 18 ++++++++++++++++++ 5 files changed, 21 insertions(+), 13 deletions(-) create mode 100644 doc/user/project/merge_requests/img/merge_when_build_succeeds_only_if_succeeds_msg.png rename doc/user/project/merge_requests/img/{only_allow_merge_if_build_succeeds.png => merge_when_build_succeeds_only_if_succeeds_settings.png} (100%) diff --git a/app/views/projects/_merge_request_settings.html.haml b/app/views/projects/_merge_request_settings.html.haml index 14eb47089b1..80053dd501b 100644 --- a/app/views/projects/_merge_request_settings.html.haml +++ b/app/views/projects/_merge_request_settings.html.haml @@ -11,4 +11,4 @@ %br %span.descr Builds need to be configured to enable this feature. - = link_to icon('question-circle'), help_page_path('workflow/merge_requests', anchor: 'only-allow-merge-requests-to-be-merged-if-the-build-succeeds') + = link_to icon('question-circle'), help_page_path('user/project/merge_requests/merge_when_build_succeeds', anchor: 'only-allow-merge-requests-to-be-merged-if-the-build-succeeds') diff --git a/doc/user/project/merge_requests.md b/doc/user/project/merge_requests.md index ecccc96582c..a1f5cc29ba8 100644 --- a/doc/user/project/merge_requests.md +++ b/doc/user/project/merge_requests.md @@ -1,17 +1,7 @@ # Merge Requests -Merge requests allow you to exchange changes you made to source code - -## Only allow merge requests to be merged if the build succeeds - -You can prevent merge requests from being merged if their build did not succeed -in the project settings page. - -![only_allow_merge_if_build_succeeds](merge_requests/img/only_allow_merge_if_build_succeeds.png) - -Navigate to project settings page and select the `Only allow merge requests to be merged if the build succeeds` check box. - -Please note that you need to have builds configured to enable this feature. +Merge requests allow you to exchange changes you made to source code and +collaborate with other people on the same project. ## Checkout merge requests locally diff --git a/doc/user/project/merge_requests/img/merge_when_build_succeeds_only_if_succeeds_msg.png b/doc/user/project/merge_requests/img/merge_when_build_succeeds_only_if_succeeds_msg.png new file mode 100644 index 0000000000000000000000000000000000000000..6b9756b74183abbefeac224d0361b84bce1547db GIT binary patch literal 11136 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 an3=ZJo*FMVtkIpdkDjaRsa2`ig#R~)62Hg* literal 0 HcmV?d00001 diff --git a/doc/user/project/merge_requests/img/only_allow_merge_if_build_succeeds.png b/doc/user/project/merge_requests/img/merge_when_build_succeeds_only_if_succeeds_settings.png similarity index 100% rename from doc/user/project/merge_requests/img/only_allow_merge_if_build_succeeds.png rename to doc/user/project/merge_requests/img/merge_when_build_succeeds_only_if_succeeds_settings.png diff --git a/doc/user/project/merge_requests/merge_when_build_succeeds.md b/doc/user/project/merge_requests/merge_when_build_succeeds.md index e89fb772d0d..011f9cbc381 100644 --- a/doc/user/project/merge_requests/merge_when_build_succeeds.md +++ b/doc/user/project/merge_requests/merge_when_build_succeeds.md @@ -26,3 +26,21 @@ When the builds are retried and succeed on the second try, the merge request will automatically be merged after all. When the merge request is updated with new commits, the automatic merge is automatically canceled to allow the new changes to be reviewed. + +## Only allow merge requests to be merged if the build succeeds + +> **Note:** +You need to have builds configured to enable this feature. + +You can prevent merge requests from being merged if their build did not succeed. + +Navigate to your project's settings page, select the +**Only allow merge requests to be merged if the build succeeds** check box and +hit **Save** for the changes to take effect. + +![Only allow merge if build succeeds settings](img/merge_when_build_succeeds_only_if_succeeds_settings.png) + +From now on, every time the build fails you will not be able to merge the merge +request from the UI, until you make the build pass. + +![Only allow merge if build succeeds msg](img/merge_when_build_succeeds_only_if_succeeds_msg.png) -- GitLab