From ee9b0172571d389f45f1e81b4cd335d8e0567093 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20=C4=8Cupi=C4=87?= Date: Sat, 19 Oct 2019 20:51:11 +0200 Subject: [PATCH 1/2] Block MR with OMIPS on skipped pipeline --- app/models/merge_request.rb | 2 +- .../user_merges_only_if_pipeline_succeeds_spec.rb | 4 ++-- spec/models/merge_request_spec.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 7cdaa3e3ca70a2..c692b79c923e43 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -1079,7 +1079,7 @@ def mergeable_ci_state? return true unless project.only_allow_merge_if_pipeline_succeeds? return false unless actual_head_pipeline - actual_head_pipeline.success? || actual_head_pipeline.skipped? + actual_head_pipeline.success? end def environments_for(current_user) diff --git a/spec/features/merge_request/user_merges_only_if_pipeline_succeeds_spec.rb b/spec/features/merge_request/user_merges_only_if_pipeline_succeeds_spec.rb index 4afbf30ece4bfa..419f741d0ea8d2 100644 --- a/spec/features/merge_request/user_merges_only_if_pipeline_succeeds_spec.rb +++ b/spec/features/merge_request/user_merges_only_if_pipeline_succeeds_spec.rb @@ -89,12 +89,12 @@ context 'when CI skipped' do let(:status) { :skipped } - it 'allows MR to be merged' do + it 'does not allow MR to be merged' do visit project_merge_request_path(project, merge_request) wait_for_requests - expect(page).to have_button 'Merge' + expect(page).not_to have_button 'Merge' end end end diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index ad79bee8801415..2877b9951cec35 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -2203,7 +2203,7 @@ def set_compare(merge_request) allow(subject).to receive(:head_pipeline) { pipeline } end - it { expect(subject.mergeable_ci_state?).to be_truthy } + it { expect(subject.mergeable_ci_state?).to be_falsey } end context 'when no pipeline is associated' do -- GitLab From 921ba4f50aca3f7d338b7990ea8cdea4c7ec3a6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20=C4=8Cupi=C4=87?= Date: Sat, 19 Oct 2019 21:08:46 +0200 Subject: [PATCH 2/2] Add CHANGELOG entry --- .../mc-bug-omips-not-blocking-on-skipped-pipelines.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelogs/unreleased/mc-bug-omips-not-blocking-on-skipped-pipelines.yml diff --git a/changelogs/unreleased/mc-bug-omips-not-blocking-on-skipped-pipelines.yml b/changelogs/unreleased/mc-bug-omips-not-blocking-on-skipped-pipelines.yml new file mode 100644 index 00000000000000..560b4de81a0256 --- /dev/null +++ b/changelogs/unreleased/mc-bug-omips-not-blocking-on-skipped-pipelines.yml @@ -0,0 +1,5 @@ +--- +title: Block MR with OMIPS on skipped pipelines. +merge_request: 18838 +author: +type: fixed -- GitLab