Merge branch 'id-remove-mr-performance-feature-flag' into 'master'

Remove merge_requests_conditional_mergeability_check feature flag

See merge request gitlab-org/gitlab!23450

app/models/merge_request.rb

@@ -821,7 +821,7 @@ class MergeRequest < ApplicationRecord
   end
 
   def check_mergeability(async: false)
-    return if Feature.enabled?(:merge_requests_conditional_mergeability_check, default_enabled: true) && !recheck_merge_status?
+    return unless recheck_merge_status?
 
     check_service = MergeRequests::MergeabilityCheckService.new(self)
 

spec/models/merge_request_spec.rb

@@ -2150,20 +2150,10 @@ describe MergeRequest do
         subject.mark_as_mergeable!
       end
 
-      context 'and merge_requests_conditional_mergeability_check feature flag is enabled' do
-        it 'does not call MergeabilityCheckService' do
-          expect(MergeRequests::MergeabilityCheckService).not_to receive(:new)
+      it 'does not call MergeabilityCheckService' do
+        expect(MergeRequests::MergeabilityCheckService).not_to receive(:new)
 
-          subject.check_mergeability
-        end
-      end
-
-      context 'and merge_requests_conditional_mergeability_check feature flag is disabled' do
-        before do
-          stub_feature_flags(merge_requests_conditional_mergeability_check: false)
-        end
-
-        it_behaves_like 'method that executes MergeabilityCheckService'
+        subject.check_mergeability
       end
     end
   end