Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42

2 files changed, 6 insertions, 2 deletions

diff --git a/app/models/preloaders/project_root_ancestor_preloader.rb b/app/models/preloaders/project_root_ancestor_preloader.rb
index 1e935249407..6192f79ce2c 100644
--- a/app/models/preloaders/project_root_ancestor_preloader.rb
+++ b/app/models/preloaders/project_root_ancestor_preloader.rb
@@ -9,7 +9,7 @@ module Preloaders
     end
 
     def execute
-      return if @projects.is_a?(ActiveRecord::NullRelation)
+      return unless @projects.is_a?(ActiveRecord::Relation)
       return unless ::Feature.enabled?(:use_traversal_ids)
 
       root_query = Namespace.joins("INNER JOIN (#{join_sql}) as root_query ON root_query.root_id = namespaces.id")
diff --git a/app/models/preloaders/user_max_access_level_in_projects_preloader.rb b/app/models/preloaders/user_max_access_level_in_projects_preloader.rb
index 2e2272a2ef5..c9fd5e7718a 100644
--- a/app/models/preloaders/user_max_access_level_in_projects_preloader.rb
+++ b/app/models/preloaders/user_max_access_level_in_projects_preloader.rb
@@ -7,9 +7,11 @@ module Preloaders
     def initialize(projects, user)
       @projects = if projects.is_a?(Array)
                     Project.where(id: projects)
-                  else
+                  elsif Feature.enabled?(:projects_preloader_fix)
                     # Push projects base query in to a sub-select to avoid
                     # table name clashes. Performs better than aliasing.
+                    Project.where(id: projects.subquery(:id))
+                  else
                     Project.where(id: projects.reselect(:id))
                   end
 
@@ -17,6 +19,8 @@ module Preloaders
     end
 
     def execute
+      return unless @user
+
       project_authorizations = ProjectAuthorization.arel_table
 
       auths = @projects