Merge branch 'mc/bug/omips-not-blocking-on-skipped-pipelines' into 'master'

Block MR with OMIPS on skipped pipelines

Closes #30059

See merge request gitlab-org/gitlab!18838

app/models/merge_request.rb

@@ -1081,7 +1081,7 @@ class MergeRequest < ApplicationRecord
     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)

changelogs/unreleased/mc-bug-omips-not-blocking-on-skipped-pipelines.yml

+---
+title: Block MR with OMIPS on skipped pipelines.
+merge_request: 18838
+author:
+type: fixed

spec/features/merge_request/user_merges_only_if_pipeline_succeeds_spec.rb

@@ -89,12 +89,12 @@ describe 'Merge request > User merges only if pipeline succeeds', :js do
       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

spec/models/merge_request_spec.rb

@@ -2267,7 +2267,7 @@ describe MergeRequest do
           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