From b76ae638462ab0f673e5915986070518dd3f9ad3 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 19 Aug 2021 09:08:42 +0000 Subject: Add latest changes from gitlab-org/gitlab@14-2-stable-ee --- .../preloaders/user_max_access_level_in_projects_preloader.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'app/models/preloaders') 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) -- cgit v1.2.1