Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
bc57fc7c
Commit
bc57fc7c
authored
Oct 07, 2016
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update documentation according to changes in MWBS
parent
e351ed2d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
10 deletions
+10
-10
doc/user/project/merge_requests/merge_when_build_succeeds.md
doc/user/project/merge_requests/merge_when_build_succeeds.md
+10
-10
No files found.
doc/user/project/merge_requests/merge_when_build_succeeds.md
View file @
bc57fc7c
# Merge When Build Succeeds
# Merge When Build Succeeds
When reviewing a merge request that looks ready to merge but still has one or
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
more CI builds running, you can set it to be merged automatically when
the
builds
succeed. This way, you don't have to wait for the builds to finish and
builds
pipeline succeed. This way, you don't have to wait for the builds to
remember to merge the request manually.
finish and
remember to merge the request manually.
![
Enable
](
img/merge_when_build_succeeds_enable.png
)
![
Enable
](
img/merge_when_build_succeeds_enable.png
)
When you hit the "Merge When Build Succeeds" button, the status of the merge
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
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
for the
pipeline to succeed and want to merge immediately, this option is
in the dropdown menu on the right of the main button.
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
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
cancel the automatic merge if they find a reason why it shouldn't be merged
...
@@ -18,9 +18,9 @@ after all.
...
@@ -18,9 +18,9 @@ after all.
![
Status
](
img/merge_when_build_succeeds_status.png
)
![
Status
](
img/merge_when_build_succeeds_status.png
)
When the
build succeeds, the merge request will automatically be merged. When
When the
pipeline succeeds, the merge request will automatically be merged.
the build fails, the author gets a chance to retry any failed builds, or to
When the pipeline fails, the author gets a chance to retry any failed builds,
push new commits to fix the failure.
or to
push new commits to fix the failure.
When the builds are retried and succeed on the second try, the merge request
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
will automatically be merged after all. When the merge request is updated with
...
@@ -40,7 +40,7 @@ hit **Save** for the changes to take effect.
...
@@ -40,7 +40,7 @@ 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
)
![
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 merg
e
From now on, every time the
pipelinefails you will not be able to merge th
e
request from the UI, until you make the build
pass.
merge request from the UI, until you make all relevant builds
pass.
![
Only allow merge if build succeeds msg
](
img/merge_when_build_succeeds_only_if_succeeds_msg.png
)
![
Only allow merge if build succeeds msg
](
img/merge_when_build_succeeds_only_if_succeeds_msg.png
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment