diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-12 21:09:21 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-12 21:09:21 +0300 |
| commit | 43e3dc2f95a25c600e08f65d4f1c406a1a63ed3d (patch) | |
| tree | db5c72020c7c8916020c8aff7c1b7128028d650b /app/services/users | |
| parent | 2c89e169769ead722394a79ed67fcd08e96863dd (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/users')
| -rw-r--r-- | app/services/users/destroy_service.rb | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/app/services/users/destroy_service.rb b/app/services/users/destroy_service.rb index 643ebdc6839..ef79ee3d06e 100644 --- a/app/services/users/destroy_service.rb +++ b/app/services/users/destroy_service.rb @@ -56,12 +56,10 @@ module Users MigrateToGhostUserService.new(user).execute unless options[:hard_delete] - if Feature.enabled?(:destroy_user_associations_in_batches) - # Rails attempts to load all related records into memory before - # destroying: https://github.com/rails/rails/issues/22510 - # This ensures we delete records in batches. - user.destroy_dependent_associations_in_batches - end + # Rails attempts to load all related records into memory before + # destroying: https://github.com/rails/rails/issues/22510 + # This ensures we delete records in batches. + user.destroy_dependent_associations_in_batches # Destroy the namespace after destroying the user since certain methods may depend on the namespace existing user_data = user.destroy |