BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
adb3f3d4
Commit
adb3f3d4
authored
Nov 25, 2016
by
Achilleas Pipinellis
Committed by
Grzegorz Bizon
Nov 29, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move MWPS document to new location
parent
b8e10e32
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
54 additions
and
49 deletions
+54
-49
README.md
doc/intro/README.md
+1
-1
merge_requests.md
doc/user/project/merge_requests.md
+1
-1
merge_when_build_succeeds.md
doc/user/project/merge_requests/merge_when_build_succeeds.md
+3
-44
merge_when_pipeline_succeeds.md
...er/project/merge_requests/merge_when_pipeline_succeeds.md
+46
-0
README.md
doc/workflow/README.md
+2
-2
merge_when_build_succeeds.md
doc/workflow/merge_when_build_succeeds.md
+1
-1
No files found.
doc/intro/README.md
View file @
adb3f3d4
...
@@ -23,7 +23,7 @@ Create merge requests and review code.
...
@@ -23,7 +23,7 @@ Create merge requests and review code.
-
[
Fork a project and contribute to it
](
../workflow/forking_workflow.md
)
-
[
Fork a project and contribute to it
](
../workflow/forking_workflow.md
)
-
[
Create a new merge request
](
../gitlab-basics/add-merge-request.md
)
-
[
Create a new merge request
](
../gitlab-basics/add-merge-request.md
)
-
[
Automatically close issues from merge requests
](
../user/project/issues/automatic_issue_closing.md
)
-
[
Automatically close issues from merge requests
](
../user/project/issues/automatic_issue_closing.md
)
-
[
Automatically merge when pipeline succeeds
](
../user/project/merge_requests/merge_when_
build
_succeeds.md
)
-
[
Automatically merge when pipeline succeeds
](
../user/project/merge_requests/merge_when_
pipeline
_succeeds.md
)
-
[
Revert any commit
](
../user/project/merge_requests/revert_changes.md
)
-
[
Revert any commit
](
../user/project/merge_requests/revert_changes.md
)
-
[
Cherry-pick any commit
](
../user/project/merge_requests/cherry_pick_changes.md
)
-
[
Cherry-pick any commit
](
../user/project/merge_requests/cherry_pick_changes.md
)
...
...
doc/user/project/merge_requests.md
View file @
adb3f3d4
...
@@ -26,7 +26,7 @@ more CI builds running, you can set it to be merged automatically when CI
...
@@ -26,7 +26,7 @@ more CI builds running, you can set it to be merged automatically when CI
pipeline succeeds. This way, you don't have to wait for the pipeline to finish
pipeline succeeds. This way, you don't have to wait for the pipeline to finish
and remember to merge the request manually.
and remember to merge the request manually.
[
Learn more about merging when pipeline succeeds.
](
merge_requests/merge_when_
build
_succeeds.md
)
[
Learn more about merging when pipeline succeeds.
](
merge_requests/merge_when_
pipeline
_succeeds.md
)
## Resolve discussion comments in merge requests reviews
## Resolve discussion comments in merge requests reviews
...
...
doc/user/project/merge_requests/merge_when_build_succeeds.md
View file @
adb3f3d4
# Merge When Pipeline Succeeds
This document was moved to
[
merge_when_pipeline_succeeds
](
merge_when_pipeline_succeeds.md
)
.
When reviewing a merge request that looks ready to merge but still has one or
>[Introduced][ce-7135] by the "Rename MWBS service to Merge When Pipeline Succeeds" change.
more CI builds running, you can set it to be merged automatically when the
builds pipeline succeeds. 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
)
[
ce-7135
]:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7135
When you hit the "Merge When Pipeline Succeeds" button, the status of the merge
request will be updated to represent the impending merge. If you cannot wait
for the pipeline 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 pipeline succeeds, the merge request will automatically be merged.
When the pipeline 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.
## Only allow merge requests to be merged if the pipeline succeeds
> **Note:**
You need to have builds configured to enable this feature.
You can prevent merge requests from being merged if their pipeline did not succeed.
Navigate to your project's settings page, select the
**Only allow merge requests to be merged if the pipeline succeeds**
check box and
hit
**Save**
for the changes to take effect.
![
Only allow merge if pipeline succeeds settings
](
img/merge_when_build_succeeds_only_if_succeeds_settings.png
)
From now on, every time the pipeline fails you will not be able to merge the
merge request from the UI, until you make all relevant builds pass.
![
Only allow merge if pipeline succeeds message
](
img/merge_when_build_succeeds_only_if_succeeds_msg.png
)
doc/user/project/merge_requests/merge_when_pipeline_succeeds.md
0 → 100644
View file @
adb3f3d4
# Merge When Pipeline 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 the
builds pipeline succeeds. 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 Pipeline Succeeds" button, the status of the merge
request will be updated to represent the impending merge. If you cannot wait
for the pipeline 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 pipeline succeeds, the merge request will automatically be merged.
When the pipeline 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.
## Only allow merge requests to be merged if the pipeline succeeds
> **Note:**
You need to have builds configured to enable this feature.
You can prevent merge requests from being merged if their pipeline did not succeed.
Navigate to your project's settings page, select the
**Only allow merge requests to be merged if the pipeline succeeds**
check box and
hit
**Save**
for the changes to take effect.
![
Only allow merge if pipeline succeeds settings
](
img/merge_when_build_succeeds_only_if_succeeds_settings.png
)
From now on, every time the pipeline fails you will not be able to merge the
merge request from the UI, until you make all relevant builds pass.
![
Only allow merge if pipeline succeeds message
](
img/merge_when_build_succeeds_only_if_succeeds_msg.png
)
doc/workflow/README.md
View file @
adb3f3d4
...
@@ -25,12 +25,12 @@
...
@@ -25,12 +25,12 @@
-
[
Merge Requests
](
../user/project/merge_requests.md
)
-
[
Merge Requests
](
../user/project/merge_requests.md
)
-
[
Authorization for merge requests
](
../user/project/merge_requests/authorization_for_merge_requests.md
)
-
[
Authorization for merge requests
](
../user/project/merge_requests/authorization_for_merge_requests.md
)
-
[
Cherry-pick changes
](
../user/project/merge_requests/cherry_pick_changes.md
)
-
[
Cherry-pick changes
](
../user/project/merge_requests/cherry_pick_changes.md
)
-
[
Merge when pipeline succeeds
](
../user/project/merge_requests/merge_when_
build
_succeeds.md
)
-
[
Merge when pipeline succeeds
](
../user/project/merge_requests/merge_when_
pipeline
_succeeds.md
)
-
[
Resolve discussion comments in merge requests reviews
](
../user/project/merge_requests/merge_request_discussion_resolution.md
)
-
[
Resolve discussion comments in merge requests reviews
](
../user/project/merge_requests/merge_request_discussion_resolution.md
)
-
[
Resolve merge conflicts in the UI
](
../user/project/merge_requests/resolve_conflicts.md
)
-
[
Resolve merge conflicts in the UI
](
../user/project/merge_requests/resolve_conflicts.md
)
-
[
Revert changes in the UI
](
../user/project/merge_requests/revert_changes.md
)
-
[
Revert changes in the UI
](
../user/project/merge_requests/revert_changes.md
)
-
[
Merge requests versions
](
../user/project/merge_requests/versions.md
)
-
[
Merge requests versions
](
../user/project/merge_requests/versions.md
)
-
[
"Work In Progress" merge requests
](
../user/project/merge_requests/work_in_progress_merge_requests.md
)
-
[
"Work In Progress" merge requests
](
../user/project/merge_requests/work_in_progress_merge_requests.md
)
-
[
Manage large binaries with Git LFS
](
lfs/manage_large_binaries_with_git_lfs.md
)
-
[
Manage large binaries with Git LFS
](
lfs/manage_large_binaries_with_git_lfs.md
)
-
[
Importing from SVN, GitHub, Bit
B
ucket, etc
](
importing/README.md
)
-
[
Importing from SVN, GitHub, Bit
b
ucket, etc
](
importing/README.md
)
-
[
Todos
](
todos.md
)
-
[
Todos
](
todos.md
)
doc/workflow/merge_when_build_succeeds.md
View file @
adb3f3d4
This document was moved to
[
user/project/merge_requests/merge_when_build_succeeds
](
../user/project/merge_requests/merge_when_build
_succeeds.md
)
.
This document was moved to
[
merge_when_pipeline_succeeds
](
../user/project/merge_requests/merge_when_pipeline
_succeeds.md
)
.
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