diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-03-12 16:00:48 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-03-12 16:00:48 +0000 |
| commit | b80c2287958d10626b49a483c8cc9ea306e7aea0 (patch) | |
| tree | c80be7682dd6134ab5c8044e8aec8837ba550af4 /app/services/users/destroy_service.rb | |
| parent | 52fa89e8d1872b909c98ddd4bcacc2ab00ac6e57 (diff) | |
| parent | 7f3e6473ca8e25ee7b860cb6ed6416fc1c98f8b2 (diff) | |
| download | gitlab-ce-b80c2287958d10626b49a483c8cc9ea306e7aea0.tar.gz | |
Merge branch '10-6-stable-frozen' into '10-6-stable'
Merge 10-6-stable-frozen into 10-6-stable
See merge request gitlab-org/gitlab-ce!17644
Diffstat (limited to 'app/services/users/destroy_service.rb')
| -rw-r--r-- | app/services/users/destroy_service.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/services/users/destroy_service.rb b/app/services/users/destroy_service.rb index b71002433d6..06b604dad4d 100644 --- a/app/services/users/destroy_service.rb +++ b/app/services/users/destroy_service.rb @@ -49,6 +49,8 @@ module Users ::Projects::DestroyService.new(project, current_user, skip_repo: project.legacy_storage?).execute end + yield(user) if block_given? + MigrateToGhostUserService.new(user).execute unless options[:hard_delete] # Destroy the namespace after destroying the user since certain methods may depend on the namespace existing |