Use new images for the old functiondoc/merge-when-build-succeeds

[ci skip]

6 files changed, 14 insertions, 9 deletions

diff --git a/doc/workflow/img/merge_when_build_succeeds_enable.png b/doc/workflow/img/merge_when_build_succeeds_enable.png
index 633efa1246f..aa360213051 100644
--- a/doc/workflow/img/merge_when_build_succeeds_enable.png
+++ b/doc/workflow/img/merge_when_build_succeeds_enable.png
diff --git a/doc/workflow/img/merge_when_build_succeds_merge_request_settings.png b/doc/workflow/img/merge_when_build_succeeds_merge_request_settings.png
index b28fa3f3e76..b28fa3f3e76 100644
--- a/doc/workflow/img/merge_when_build_succeds_merge_request_settings.png
+++ b/doc/workflow/img/merge_when_build_succeeds_merge_request_settings.png
diff --git a/doc/workflow/img/merge_when_build_succeds_only_build_failed.png b/doc/workflow/img/merge_when_build_succeeds_only_build_failed.png
index b9feeeaad88..b9feeeaad88 100644
--- a/doc/workflow/img/merge_when_build_succeds_only_build_failed.png
+++ b/doc/workflow/img/merge_when_build_succeeds_only_build_failed.png
diff --git a/doc/workflow/img/merge_when_build_succeeds_options.png b/doc/workflow/img/merge_when_build_succeeds_options.png
new file mode 100644
index 00000000000..ff2f879ab77
--- /dev/null
+++ b/doc/workflow/img/merge_when_build_succeeds_options.png
diff --git a/doc/workflow/img/merge_when_build_succeeds_status.png b/doc/workflow/img/merge_when_build_succeeds_status.png
index c856c7d14dc..902081d647e 100644
--- a/doc/workflow/img/merge_when_build_succeeds_status.png
+++ b/doc/workflow/img/merge_when_build_succeeds_status.png
diff --git a/doc/workflow/merge_when_build_succeeds.md b/doc/workflow/merge_when_build_succeeds.md
index 779ca636f11..1c7beb03c53 100644
--- a/doc/workflow/merge_when_build_succeeds.md
+++ b/doc/workflow/merge_when_build_succeeds.md
@@ -13,18 +13,26 @@ remember to merge the request manually.
 ---
 
 When you hit the "Merge When Build Succeeds" button, the status of the merge
-request will be updated to represent the impending merge. If you cannot wait
-for the build to succeed and want to merge immediately, this option is available
-in the dropdown menu on the right of the main button.
+request will be updated to represent the impending merge.
 
 Both team developers and the author of the merge request have the option to
 cancel the automatic merge if they find a reason why it shouldn't be merged
-after all.
+after all. In case new commits are pushed while the builds are still running,
+the automatic merge is automatically canceled to allow the new changes to be
+reviewed.
 
 ![Status](img/merge_when_build_succeeds_status.png)
 
 ---
 
+If you cannot wait
+for the build to succeed and want to merge immediately, this option is available
+in the dropdown menu on the right of the main button.
+
+![Options](img/merge_when_build_succeeds_options.png)
+
+---
+
 When the build succeeds, the merge request will automatically be merged. When
 the build fails, the author gets a chance to retry any failed builds, or to
 push new commits to fix the failure.
@@ -32,9 +40,6 @@ push new commits to fix the failure.
 When the builds are retried and succeed on the second try, the merge request
 will automatically be merged after all.
 
-In case new commits are pushed while the builds are still running, 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:**
@@ -45,7 +50,7 @@ requests from being merged when the builds have failed. This option can be set
 at a project level, navigating to your project's **Settings** under the
 "Merge requests" section.
 
-![Merge Request settings](img/merge_when_build_succeds_merge_request_settings.png)
+![Merge Request settings](img/merge_when_build_succeeds_merge_request_settings.png)
 
 By enabling this option, as long as the builds are running, the "Accept Merge
 Request" button will disappear, and the only option will be to "Merge When Build
@@ -56,7 +61,7 @@ Succeeds".
 If the builds fail you will not be able to merge the merge request and a
 descriptive message will tell you why.
 
-![Failed restricted Merge Request to be merged only if green is build](img/merge_when_build_succeds_only_build_failed.png)
+![Failed restricted Merge Request to be merged only if green is build](img/merge_when_build_succeeds_only_build_failed.png)
 
 
 [ce-1729]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1729