Add latest changes from gitlab-org/gitlab@16-5-stable-eev16.5.0-rc42

1 files changed, 27 insertions, 0 deletions

diff --git a/app/services/merge_requests/mergeability/check_conflict_status_service.rb b/app/services/merge_requests/mergeability/check_conflict_status_service.rb
new file mode 100644
index 00000000000..2bc253322c9
--- /dev/null
+++ b/app/services/merge_requests/mergeability/check_conflict_status_service.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module MergeRequests
+  module Mergeability
+    class CheckConflictStatusService < CheckBaseService
+      def self.failure_reason
+        :conflict
+      end
+
+      def execute
+        if merge_request.can_be_merged?
+          success
+        else
+          failure(reason: failure_reason)
+        end
+      end
+
+      def skip?
+        false
+      end
+
+      def cacheable?
+        false
+      end
+    end
+  end
+end