3 files changed, 24 insertions, 0 deletions
diff --git a/lib/banzai/reference_parser/base_parser.rb b/lib/banzai/reference_parser/base_parser.rb
index 831baa9a778..19d91876892 100644
--- a/lib/banzai/reference_parser/base_parser.rb
+++ b/lib/banzai/reference_parser/base_parser.rb
@@ -66,6 +66,8 @@ module Banzai
         projects = lazy { projects_for_nodes(nodes) }
         project_attr = 'data-project'
 
+        preload_associations(projects, user)
+
         nodes.select do |node|
           if node.has_attribute?(project_attr)
             can_read_reference?(user, projects[node], node)
@@ -261,6 +263,14 @@ module Banzai
           hash[key] = {}
         end
       end
+
+      # For any preloading of project associations
+      # needed to avoid N+1s.
+      # Note: `projects` param is a hash of { node => project }.
+      # See #projects_for_nodes for more information.
+      def preload_associations(projects, user)
+        ::Preloaders::ProjectPolicyPreloader.new(projects.values, user).execute
+      end
     end
   end
 end
diff --git a/lib/banzai/reference_parser/commit_parser.rb b/lib/banzai/reference_parser/commit_parser.rb
index 88896970bc6..c51f4976c28 100644
--- a/lib/banzai/reference_parser/commit_parser.rb
+++ b/lib/banzai/reference_parser/commit_parser.rb
@@ -32,6 +32,13 @@ module Banzai
         commits
       end
 
+      def nodes_visible_to_user(user, nodes)
+        projects = lazy { projects_for_nodes(nodes) }
+        user.preloaded_member_roles_for_projects(projects.values) if user
+
+        super
+      end
+
       private
 
       def can_read_reference?(user, ref_project, node)
diff --git a/lib/banzai/reference_parser/commit_range_parser.rb b/lib/banzai/reference_parser/commit_range_parser.rb
index fb4a392105f..3d09bc83151 100644
--- a/lib/banzai/reference_parser/commit_range_parser.rb
+++ b/lib/banzai/reference_parser/commit_range_parser.rb
@@ -38,6 +38,13 @@ module Banzai
         range.valid_commits? ? range : nil
       end
 
+      def nodes_visible_to_user(user, nodes)
+        projects = lazy { projects_for_nodes(nodes) }
+        user.preloaded_member_roles_for_projects(projects.values) if user
+
+        super
+      end
+
       private
 
       def can_read_reference?(user, ref_project, node)