Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42

1 files changed, 5 insertions, 1 deletions

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 c0ed56057ae..3764e9dcb16 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
@@ -10,9 +10,13 @@ module Preloaders
     end
 
     def execute
+      # Use reselect to override the existing select to prevent
+      # the error `subquery has too many columns`
+      # NotificationsController passes in an Array so we need to check the type
+      project_ids = @projects.is_a?(ActiveRecord::Relation) ? @projects.reselect(:id) : @projects
       access_levels = @user
         .project_authorizations
-        .where(project_id: @projects)
+        .where(project_id: project_ids)
         .group(:project_id)
         .maximum(:access_level)