Commit 88196399 authored by Shinya Maeda's avatar Shinya Maeda Committed by Lin Jen-Shin

Remove merge request pipeline check in mergeable method

parent 2efbe19b
...@@ -71,13 +71,6 @@ module EE ...@@ -71,13 +71,6 @@ module EE
end end
end end
override :mergeable_ci_state?
def mergeable_ci_state?
return false unless validate_merge_request_pipelines
super
end
def get_on_train!(user) def get_on_train!(user)
create_merge_train!(user: user, target_project: target_project, target_branch: target_branch) create_merge_train!(user: user, target_project: target_project, target_branch: target_branch)
end end
...@@ -99,12 +92,6 @@ module EE ...@@ -99,12 +92,6 @@ module EE
false false
end end
def validate_merge_request_pipelines
return true unless project.merge_pipelines_enabled?
actual_head_pipeline&.latest_merge_request_pipeline?
end
def validate_approval_rule_source def validate_approval_rule_source
return unless approval_rules.any? return unless approval_rules.any?
......
---
title: Allow merge requests to be merged even when it does not have up-to-date pipeline when merge request pipeline is enabled
merge_request: 12309
author:
type: changed
...@@ -622,64 +622,6 @@ describe MergeRequest do ...@@ -622,64 +622,6 @@ describe MergeRequest do
end end
end end
describe '#mergeable_ci_state?' do
subject { merge_request.mergeable_ci_state? }
let(:project) { create(:project, :repository) }
let(:merge_request) do
create(:merge_request,
:with_merge_request_pipeline,
source_branch: 'feature',
source_project: project,
target_branch: 'master',
target_project: project)
end
shared_examples_for 'merge pipelines project option is disabled' do
before do
project.merge_pipelines_enabled = false
end
it { is_expected.to be_truthy }
end
before do
stub_licensed_features(merge_pipelines: true)
project.merge_pipelines_enabled = true
merge_request.update_head_pipeline
end
it { is_expected.to be_truthy }
context 'when head pipeline is a detached merge request pipeline' do
before do
merge_request.head_pipeline.update_column(:target_sha, nil)
end
it { is_expected.to be_falsy }
it_behaves_like 'merge pipelines project option is disabled'
end
context 'when source sha of the merge request pipeline is not HEAD' do
before do
merge_request.head_pipeline.update_column(:source_sha, 'old-commit')
end
it { is_expected.to be_falsy }
it_behaves_like 'merge pipelines project option is disabled'
end
context 'when target sha of the merge request pipeline is not HEAD' do
before do
merge_request.head_pipeline.update_column(:target_sha, 'old-commit')
end
it { is_expected.to be_falsy }
it_behaves_like 'merge pipelines project option is disabled'
end
end
describe '#get_on_train!' do describe '#get_on_train!' do
subject { merge_request.get_on_train!(user) } subject { merge_request.get_on_train!(user) }
......
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