diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-30 15:23:27 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-30 15:23:27 +0300 |
| commit | 3bba41a8c5dfcca0d086eaef10ef36a705dd4f7a (patch) | |
| tree | 81954681947aaa85592fa7f3c9beed23a7b6bb01 /app/services | |
| parent | 1aa447601c6be1e964acbb674887649dab23b804 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/clusters/agents/authorizations/user_access/refresh_service.rb | 4 | ||||
| -rw-r--r-- | app/services/users/migrate_records_to_ghost_user_service.rb | 7 |
2 files changed, 9 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 diff --git a/app/services/users/migrate_records_to_ghost_user_service.rb b/app/services/users/migrate_records_to_ghost_user_service.rb index 06950292fea..bd651a3c45e 100644 --- a/app/services/users/migrate_records_to_ghost_user_service.rb +++ b/app/services/users/migrate_records_to_ghost_user_service.rb @@ -33,6 +33,8 @@ module Users attr_reader :execution_tracker def migrate_records + migrate_user_achievements + return if hard_delete migrate_issues @@ -101,6 +103,11 @@ module Users batched_migrate(Release, :author_id) end + def migrate_user_achievements + batched_migrate(Achievements::UserAchievement, :awarded_by_user_id) + batched_migrate(Achievements::UserAchievement, :revoked_by_user_id) + end + # rubocop:disable CodeReuse/ActiveRecord def batched_migrate(base_scope, column, batch_size: 50) loop do |