5 files changed, 16 insertions, 4 deletions
diff --git a/lib/banzai/reference_parser/epic_parser.rb b/lib/banzai/reference_parser/epic_parser.rb
index 7e72a260839..862d09934e9 100644
--- a/lib/banzai/reference_parser/epic_parser.rb
+++ b/lib/banzai/reference_parser/epic_parser.rb
@@ -13,4 +13,4 @@ module Banzai
   end
 end
 
-Banzai::ReferenceParser::EpicParser.prepend_if_ee('::EE::Banzai::ReferenceParser::EpicParser')
+Banzai::ReferenceParser::EpicParser.prepend_mod_with('Banzai::ReferenceParser::EpicParser')
diff --git a/lib/banzai/reference_parser/iteration_parser.rb b/lib/banzai/reference_parser/iteration_parser.rb
index 45253fa1977..981354aa8e1 100644
--- a/lib/banzai/reference_parser/iteration_parser.rb
+++ b/lib/banzai/reference_parser/iteration_parser.rb
@@ -19,4 +19,4 @@ module Banzai
   end
 end
 
-Banzai::ReferenceParser::IterationParser.prepend_if_ee('::EE::Banzai::ReferenceParser::IterationParser')
+Banzai::ReferenceParser::IterationParser.prepend_mod_with('Banzai::ReferenceParser::IterationParser')
diff --git a/lib/banzai/reference_parser/merge_request_parser.rb b/lib/banzai/reference_parser/merge_request_parser.rb
index d7bf450465e..24bc1a24e09 100644
--- a/lib/banzai/reference_parser/merge_request_parser.rb
+++ b/lib/banzai/reference_parser/merge_request_parser.rb
@@ -3,6 +3,8 @@
 module Banzai
   module ReferenceParser
     class MergeRequestParser < IssuableParser
+      include Gitlab::Utils::StrongMemoize
+
       self.reference_type = :merge_request
 
       def records_for_nodes(nodes)
@@ -27,6 +29,16 @@ module Banzai
           self.class.data_attribute
         )
       end
+
+      def can_read_reference?(user, merge_request)
+        memo = strong_memoize(:can_read_reference) { {} }
+
+        project_id = merge_request.project_id
+
+        return memo[project_id] if memo.key?(project_id)
+
+        memo[project_id] = can?(user, :read_merge_request_iid, merge_request.project)
+      end
     end
   end
 end
diff --git a/lib/banzai/reference_parser/project_parser.rb b/lib/banzai/reference_parser/project_parser.rb
index b4e3a55b4f1..6c600508996 100644
--- a/lib/banzai/reference_parser/project_parser.rb
+++ b/lib/banzai/reference_parser/project_parser.rb
@@ -19,7 +19,7 @@ module Banzai
       def readable_project_ids_for(user)
         @project_ids_by_user ||= {}
         @project_ids_by_user[user] ||=
-          Project.public_or_visible_to_user(user).where("projects.id IN (?)", @projects_for_nodes.values.map(&:id)).pluck(:id)
+          Project.public_or_visible_to_user(user).where(projects: { id: @projects_for_nodes.values.map(&:id) }).pluck(:id)
       end
 
       def can_read_reference?(user, ref_project, node)
diff --git a/lib/banzai/reference_parser/vulnerability_parser.rb b/lib/banzai/reference_parser/vulnerability_parser.rb
index 143f2605927..86b16605d39 100644
--- a/lib/banzai/reference_parser/vulnerability_parser.rb
+++ b/lib/banzai/reference_parser/vulnerability_parser.rb
@@ -13,4 +13,4 @@ module Banzai
   end
 end
 
-Banzai::ReferenceParser::VulnerabilityParser.prepend_if_ee('::EE::Banzai::ReferenceParser::VulnerabilityParser')
+Banzai::ReferenceParser::VulnerabilityParser.prepend_mod_with('Banzai::ReferenceParser::VulnerabilityParser')