Skip to content
Snippets Groups Projects
Commit 577a2300 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis
Browse files

Use new images for the old function

[ci skip]
parent dfe35599
No related branches found
No related tags found
No related merge requests found
doc/workflow/img/merge_when_build_succeeds_enable.png

148 KiB | W: 2428px | H: 730px

doc/workflow/img/merge_when_build_succeeds_enable.png

57.4 KiB | W: 1130px | H: 532px

doc/workflow/img/merge_when_build_succeeds_enable.png
doc/workflow/img/merge_when_build_succeeds_enable.png
doc/workflow/img/merge_when_build_succeeds_enable.png
doc/workflow/img/merge_when_build_succeeds_enable.png
  • 2-up
  • Swipe
  • Onion skin
doc/workflow/img/merge_when_build_succeeds_options.png

22.7 KiB

doc/workflow/img/merge_when_build_succeeds_status.png

176 KiB | W: 2422px | H: 838px

doc/workflow/img/merge_when_build_succeeds_status.png

63 KiB | W: 1131px | H: 576px

doc/workflow/img/merge_when_build_succeeds_status.png
doc/workflow/img/merge_when_build_succeeds_status.png
doc/workflow/img/merge_when_build_succeeds_status.png
doc/workflow/img/merge_when_build_succeeds_status.png
  • 2-up
  • Swipe
  • Onion skin
Loading
Loading
@@ -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.
Loading
Loading
@@ -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:**
Loading
Loading
@@ -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
Loading
Loading
@@ -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
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment