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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
4d77056a
Commit
4d77056a
authored
Sep 05, 2016
by
Achilleas Pipinellis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move "Only allow merge requests to be merged if the build succeeds" to new location
parent
a8ba5840
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
13 deletions
+21
-13
app/views/projects/_merge_request_settings.html.haml
app/views/projects/_merge_request_settings.html.haml
+1
-1
doc/user/project/merge_requests.md
doc/user/project/merge_requests.md
+2
-12
doc/user/project/merge_requests/img/merge_when_build_succeeds_only_if_succeeds_msg.png
...ts/img/merge_when_build_succeeds_only_if_succeeds_msg.png
+0
-0
doc/user/project/merge_requests/img/merge_when_build_succeeds_only_if_succeeds_settings.png
...g/merge_when_build_succeeds_only_if_succeeds_settings.png
+0
-0
doc/user/project/merge_requests/merge_when_build_succeeds.md
doc/user/project/merge_requests/merge_when_build_succeeds.md
+18
-0
No files found.
app/views/projects/_merge_request_settings.html.haml
View file @
4d77056a
...
@@ -11,4 +11,4 @@
...
@@ -11,4 +11,4 @@
%br
%br
%span
.descr
%span
.descr
Builds need to be configured to enable this feature.
Builds need to be configured to enable this feature.
=
link_to
icon
(
'question-circle'
),
help_page_path
(
'
workflow/merge_request
s'
,
anchor:
'only-allow-merge-requests-to-be-merged-if-the-build-succeeds'
)
=
link_to
icon
(
'question-circle'
),
help_page_path
(
'
user/project/merge_requests/merge_when_build_succeed
s'
,
anchor:
'only-allow-merge-requests-to-be-merged-if-the-build-succeeds'
)
doc/user/project/merge_requests.md
View file @
4d77056a
# Merge Requests
# Merge Requests
Merge requests allow you to exchange changes you made to source code
Merge requests allow you to exchange changes you made to source code and
collaborate with other people on the same project.
## Only allow merge requests to be merged if the build succeeds
You can prevent merge requests from being merged if their build did not succeed
in the project settings page.
![
only_allow_merge_if_build_succeeds
](
merge_requests/img/only_allow_merge_if_build_succeeds.png
)
Navigate to project settings page and select the
`Only allow merge requests to be merged if the build succeeds`
check box.
Please note that you need to have builds configured to enable this feature.
## Checkout merge requests locally
## Checkout merge requests locally
...
...
doc/user/project/merge_requests/img/merge_when_build_succeeds_only_if_succeeds_msg.png
0 → 100644
View file @
4d77056a
10.9 KB
doc/user/project/merge_requests/img/
only_allow_merge_if_build_succeed
s.png
→
doc/user/project/merge_requests/img/
merge_when_build_succeeds_only_if_succeeds_setting
s.png
View file @
4d77056a
File moved
doc/user/project/merge_requests/merge_when_build_succeeds.md
View file @
4d77056a
...
@@ -26,3 +26,21 @@ When the builds are retried and succeed on the second try, the merge request
...
@@ -26,3 +26,21 @@ 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
new commits, the automatic merge is automatically canceled to allow the new
new commits, the automatic merge is automatically canceled to allow the new
changes to be reviewed.
changes to be reviewed.
## Only allow merge requests to be merged if the build succeeds
> **Note:**
You need to have builds configured to enable this feature.
You can prevent merge requests from being merged if their build did not succeed.
Navigate to your project's settings page, select the
**Only allow merge requests to be merged if the build succeeds**
check box and
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
)
From now on, every time the build fails you will not be able to merge the merge
request from the UI, until you make the build pass.
![
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