Commit 3b06ee00 authored by Marius Bobin's avatar Marius Bobin

Remove ci_pipeline_merge_request_presence_check feature flag

Changelog: other
parent 2e2cc348
...@@ -1164,11 +1164,7 @@ module Ci ...@@ -1164,11 +1164,7 @@ module Ci
end end
def merge_request? def merge_request?
if Feature.enabled?(:ci_pipeline_merge_request_presence_check, default_enabled: :yaml) merge_request_id.present? && merge_request.present?
merge_request_id.present? && merge_request.present?
else
merge_request_id.present?
end
end end
def external_pull_request? def external_pull_request?
......
---
name: ci_pipeline_merge_request_presence_check
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78574
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350734
milestone: '14.8'
type: development
group: group::pipeline execution
default_enabled: true
...@@ -438,15 +438,6 @@ RSpec.describe Ci::Pipeline, :mailer, factory_default: :keep do ...@@ -438,15 +438,6 @@ RSpec.describe Ci::Pipeline, :mailer, factory_default: :keep do
it { expect(pipeline).not_to be_merge_request } it { expect(pipeline).not_to be_merge_request }
end end
context 'when the feature flag is disabled' do
before do
stub_feature_flags(ci_pipeline_merge_request_presence_check: false)
pipeline.update!(merge_request_id: non_existing_record_id)
end
it { expect(pipeline).to be_merge_request }
end
end end
describe '#detached_merge_request_pipeline?' do describe '#detached_merge_request_pipeline?' do
......
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