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

1 files changed, 16 insertions, 2 deletions

diff --git a/app/services/merge_requests/mergeability/check_base_service.rb b/app/services/merge_requests/mergeability/check_base_service.rb
index e614a7c27fe..e1c4d751296 100644
--- a/app/services/merge_requests/mergeability/check_base_service.rb
+++ b/app/services/merge_requests/mergeability/check_base_service.rb
@@ -9,6 +9,10 @@ module MergeRequests
         @params = params
       end
 
+      def self.identifier
+        failure_reason
+      end
+
       def skip?
         raise NotImplementedError
       end
@@ -24,12 +28,22 @@ module MergeRequests
 
       private
 
+      def failure_reason
+        self.class.failure_reason
+      end
+
       def success(**args)
-        Gitlab::MergeRequests::Mergeability::CheckResult.success(payload: args)
+        Gitlab::MergeRequests::Mergeability::CheckResult
+          .success(payload: default_payload(args))
       end
 
       def failure(**args)
-        Gitlab::MergeRequests::Mergeability::CheckResult.failed(payload: args)
+        Gitlab::MergeRequests::Mergeability::CheckResult
+          .failed(payload: default_payload(args))
+      end
+
+      def default_payload(args)
+        args.merge(identifier: self.class.identifier)
       end
     end
   end