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
949cc27a
Commit
949cc27a
authored
Nov 08, 2018
by
Matija Čupić
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Strictly require a pipeline to merge
parent
e0353a24
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
2 deletions
+1
-2
app/models/merge_request.rb
app/models/merge_request.rb
+0
-1
spec/models/merge_request_spec.rb
spec/models/merge_request_spec.rb
+1
-1
No files found.
app/models/merge_request.rb
View file @
949cc27a
...
@@ -966,7 +966,6 @@ class MergeRequest < ActiveRecord::Base
...
@@ -966,7 +966,6 @@ class MergeRequest < ActiveRecord::Base
def
mergeable_ci_state?
def
mergeable_ci_state?
return
true
unless
project
.
only_allow_merge_if_pipeline_succeeds?
return
true
unless
project
.
only_allow_merge_if_pipeline_succeeds?
return
true
unless
head_pipeline
actual_head_pipeline
&
.
success?
||
actual_head_pipeline
&
.
skipped?
actual_head_pipeline
&
.
success?
||
actual_head_pipeline
&
.
skipped?
end
end
...
...
spec/models/merge_request_spec.rb
View file @
949cc27a
...
@@ -1782,7 +1782,7 @@ describe MergeRequest do
...
@@ -1782,7 +1782,7 @@ describe MergeRequest do
allow
(
subject
).
to
receive
(
:head_pipeline
)
{
nil
}
allow
(
subject
).
to
receive
(
:head_pipeline
)
{
nil
}
end
end
it
{
expect
(
subject
.
mergeable_ci_state?
).
to
be_
truth
y
}
it
{
expect
(
subject
.
mergeable_ci_state?
).
to
be_
false
y
}
end
end
end
end
...
...
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