Add latest changes from gitlab-org/gitlab@master

2 files changed, 43 insertions, 0 deletions

diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml
index 16ab9b625bf..06e07a59311 100644
--- a/app/workers/all_queues.yml
+++ b/app/workers/all_queues.yml
@@ -3027,6 +3027,15 @@
   :weight: 1
   :idempotent: true
   :tags: []
+- :name: merge_requests_mergeability_check_batch
+  :worker_name: MergeRequests::MergeabilityCheckBatchWorker
+  :feature_category: :code_review_workflow
+  :has_external_dependencies: false
+  :urgency: :low
+  :resource_boundary: :unknown
+  :weight: 1
+  :idempotent: true
+  :tags: []
 - :name: merge_requests_resolve_todos
   :worker_name: MergeRequests::ResolveTodosWorker
   :feature_category: :code_review_workflow
diff --git a/app/workers/merge_requests/mergeability_check_batch_worker.rb b/app/workers/merge_requests/mergeability_check_batch_worker.rb
new file mode 100644
index 00000000000..cbe34ac3790
--- /dev/null
+++ b/app/workers/merge_requests/mergeability_check_batch_worker.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module MergeRequests
+  class MergeabilityCheckBatchWorker
+    include ApplicationWorker
+
+    data_consistency :sticky
+
+    sidekiq_options retry: 3
+
+    feature_category :code_review_workflow
+    idempotent!
+
+    def logger
+      @logger ||= Sidekiq.logger
+    end
+
+    def perform(merge_request_ids)
+      merge_requests = MergeRequest.id_in(merge_request_ids)
+
+      merge_requests.each do |merge_request|
+        result = merge_request.check_mergeability
+
+        next unless result&.error?
+
+        logger.error(
+          worker: self.class.name,
+          message: "Failed to check mergeability of merge request: #{result.message}",
+          merge_request_id: merge_request.id
+        )
+      end
+    end
+  end
+end