Merge branch...

Merge branch '337450-enable-flag-controlled-caching-for-MergeRequestMergeabilityCheckWorker' into 'master'

Enable caching of MergeToRefService responses

See merge request gitlab-org/gitlab!69019

app/services/merge_requests/mergeability_check_service.rb

@@ -157,7 +157,9 @@ module MergeRequests
 
     def merge_to_ref
       params = { allow_conflicts: Feature.enabled?(:display_merge_conflicts_in_diff, project) }
-      result = MergeRequests::MergeToRefService.new(project: project, current_user: merge_request.author, params: params).execute(merge_request)
+      result = MergeRequests::MergeToRefService
+        .new(project: project, current_user: merge_request.author, params: params)
+        .execute(merge_request, true)
 
       result[:status] == :success
     end

spec/services/merge_requests/mergeability_check_service_spec.rb

@@ -132,6 +132,15 @@ RSpec.describe MergeRequests::MergeabilityCheckService, :clean_gitlab_redis_shar
 
     it_behaves_like 'mergeable merge request'
 
+    it 'calls MergeToRefService with cache parameter' do
+      service = instance_double(MergeRequests::MergeToRefService)
+
+      expect(MergeRequests::MergeToRefService).to receive(:new).once { service }
+      expect(service).to receive(:execute).once.with(merge_request, true).and_return(success: true)
+
+      described_class.new(merge_request).execute(recheck: true)
+    end
+
     context 'when concurrent calls' do
       it 'waits first lock and returns "cached" result in subsequent calls' do
         threads = execute_within_threads(amount: 3)