diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-29 00:10:41 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-29 00:10:41 +0300 |
| commit | 9a4a8e6be70657c1a30b0c602ea2ba58576257fe (patch) | |
| tree | 6a276e9b1171830765fec54bdd064849da484b2e /app/services/groups | |
| parent | 672c5fcf46b385257ce01c2f773a65aa3578175d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/groups')
| -rw-r--r-- | app/services/groups/destroy_service.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/services/groups/destroy_service.rb b/app/services/groups/destroy_service.rb index 45e8972213e..0b54de469f8 100644 --- a/app/services/groups/destroy_service.rb +++ b/app/services/groups/destroy_service.rb @@ -83,7 +83,10 @@ module Groups # rubocop:disable CodeReuse/ActiveRecord def destroy_group_bots - bot_ids = group.members_and_requesters.joins(:user).merge(User.project_bot).pluck(:user_id) + bot_ids = group.members_and_requesters.joins(:user) + .merge(User.project_bot) + .allow_cross_joins_across_databases(url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/422405') + .pluck(:user_id) current_user_id = current_user.id group.run_after_commit do |