From 3bba41a8c5dfcca0d086eaef10ef36a705dd4f7a Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 30 Nov 2023 12:23:27 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../clusters/agents/authorizations/user_access/refresh_service.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/services/clusters/agents') diff --git a/app/services/clusters/agents/authorizations/user_access/refresh_service.rb b/app/services/clusters/agents/authorizations/user_access/refresh_service.rb index 04d6e04c54d..7efa95739fb 100644 --- a/app/services/clusters/agents/authorizations/user_access/refresh_service.rb +++ b/app/services/clusters/agents/authorizations/user_access/refresh_service.rb @@ -59,7 +59,7 @@ module Clusters return unless project_entries - allowed_projects.where_full_path_in(project_entries.keys).map do |project| + allowed_projects.where_full_path_in(project_entries.keys, use_includes: false).map do |project| { project_id: project.id, config: user_access_as } end end @@ -70,7 +70,7 @@ module Clusters return unless group_entries - allowed_groups.where_full_path_in(group_entries.keys).map do |group| + allowed_groups.where_full_path_in(group_entries.keys, use_includes: false).map do |group| { group_id: group.id, config: user_access_as } end end -- cgit v1.2.3