diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2018-11-08 13:52:19 +0100 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2018-11-08 13:52:19 +0100 |
| commit | 949cc27ac4fc0d20fc1428c3b13ba9c66abcb55f (patch) | |
| tree | 9272f50147a5ed737036496225cdd383fc4709ba | |
| parent | e0353a2485553e87455b3b12a1cd7d2e56700a4c (diff) | |
| download | gitlab-ce-949cc27ac4fc0d20fc1428c3b13ba9c66abcb55f.tar.gz | |
Strictly require a pipeline to merge
| -rw-r--r-- | app/models/merge_request.rb | 1 | ||||
| -rw-r--r-- | spec/models/merge_request_spec.rb | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index df5678ec2f1..92add079a02 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -966,7 +966,6 @@ class MergeRequest < ActiveRecord::Base def mergeable_ci_state? return true unless project.only_allow_merge_if_pipeline_succeeds? - return true unless head_pipeline actual_head_pipeline&.success? || actual_head_pipeline&.skipped? end diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index c7202b481d3..ad9662041f4 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -1782,7 +1782,7 @@ describe MergeRequest do allow(subject).to receive(:head_pipeline) { nil } end - it { expect(subject.mergeable_ci_state?).to be_truthy } + it { expect(subject.mergeable_ci_state?).to be_falsey } end end |