Commit 793be43b authored by Grzegorz Bizon's avatar Grzegorz Bizon

Merge branch '28682-can-merge-branch-before-build-is-started' into 'master'

Resolve "Can merge branch before build is started"

Closes #28682

See merge request gitlab-org/gitlab-ce!22911
parents 8d0b4872 bfd53b7b
...@@ -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
......
---
title: Strictly require a pipeline to merge.
merge_request: 22911
author:
type: changed
...@@ -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_truthy } it { expect(subject.mergeable_ci_state?).to be_falsey }
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment