Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

2 files changed, 14 insertions, 2 deletions

diff --git a/lib/banzai/reference_parser/alert_parser.rb b/lib/banzai/reference_parser/alert_parser.rb
index 7b864d26f67..676c0ac40ef 100644
--- a/lib/banzai/reference_parser/alert_parser.rb
+++ b/lib/banzai/reference_parser/alert_parser.rb
@@ -5,14 +5,18 @@ module Banzai
     class AlertParser < BaseParser
       self.reference_type = :alert
 
+      def self.reference_class
+        AlertManagement::Alert
+      end
+
       def references_relation
         AlertManagement::Alert
       end
 
       private
 
-      def can_read_reference?(user, alert, node)
-        can?(user, :read_alert_management_alert, alert)
+      def can_read_reference?(user, project, node)
+        can?(user, :read_alert_management_alert, project)
       end
     end
   end
diff --git a/lib/banzai/reference_parser/base_parser.rb b/lib/banzai/reference_parser/base_parser.rb
index 19d91876892..88ce63a63fe 100644
--- a/lib/banzai/reference_parser/base_parser.rb
+++ b/lib/banzai/reference_parser/base_parser.rb
@@ -47,6 +47,14 @@ module Banzai
         @data_attribute ||= "data-#{reference_type.to_s.dasherize}"
       end
 
+      # Returns a model class to use as a reference.
+      # By default, the method does not take namespaces into account,
+      # thus parser classes can customize the reference class to use
+      # a model name with a namespace
+      def self.reference_class
+        reference_type.to_s.classify.constantize
+      end
+
       # context - An instance of `Banzai::RenderContext`.
       def initialize(context)
         @context = context