Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-11-30 15:23:27 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-11-30 15:23:27 +0300
commit3bba41a8c5dfcca0d086eaef10ef36a705dd4f7a (patch)
tree81954681947aaa85592fa7f3c9beed23a7b6bb01 /app/services/clusters/agents
parent1aa447601c6be1e964acbb674887649dab23b804 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/clusters/agents')
-rw-r--r--app/services/clusters/agents/authorizations/user_access/refresh_service.rb4
1 files changed, 2 insertions, 2 deletions
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