diff options
author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-09-05 13:21:22 +0200 |
---|---|---|
committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-09-05 13:21:22 +0200 |
commit | cbc97870bc03d987d82dac679d2a81eee54a4448 (patch) | |
tree | 0bacd351fb042e7ad62d8d9776fe14940422b0bc /doc/user | |
parent | cd93b90f85b197dc0b386bbcaa027beaa93e3410 (diff) | |
download | gitlab-ce-cbc97870bc03d987d82dac679d2a81eee54a4448.tar.gz |
Move merge_when_build_succeeds.md to new location
Diffstat (limited to 'doc/user')
-rw-r--r-- | doc/user/project/merge_requests/img/merge_when_build_succeeds_enable.png | bin | 0 -> 68769 bytes | |||
-rw-r--r-- | doc/user/project/merge_requests/img/merge_when_build_succeeds_status.png | bin | 0 -> 82655 bytes | |||
-rw-r--r-- | doc/user/project/merge_requests/merge_when_build_succeeds.md | 28 |
3 files changed, 28 insertions, 0 deletions
diff --git a/doc/user/project/merge_requests/img/merge_when_build_succeeds_enable.png b/doc/user/project/merge_requests/img/merge_when_build_succeeds_enable.png Binary files differnew file mode 100644 index 00000000000..b86e6d7b3fd --- /dev/null +++ b/doc/user/project/merge_requests/img/merge_when_build_succeeds_enable.png diff --git a/doc/user/project/merge_requests/img/merge_when_build_succeeds_status.png b/doc/user/project/merge_requests/img/merge_when_build_succeeds_status.png Binary files differnew file mode 100644 index 00000000000..f3ea61d8147 --- /dev/null +++ b/doc/user/project/merge_requests/img/merge_when_build_succeeds_status.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 new file mode 100644 index 00000000000..e89fb772d0d --- /dev/null +++ b/doc/user/project/merge_requests/merge_when_build_succeeds.md @@ -0,0 +1,28 @@ +# Merge When Build Succeeds + +When reviewing a merge request that looks ready to merge but still has one or +more CI builds running, you can set it to be merged automatically when all +builds succeed. This way, you don't have to wait for the builds to finish and +remember to merge the request manually. + +![Enable](img/merge_when_build_succeeds_enable.png) + +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. + +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. + +![Status](img/merge_when_build_succeeds_status.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. + +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. |