diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2018-01-02 17:21:28 +0100 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2018-01-05 17:46:53 +0100 |
| commit | b8e852429468154a2eda04b490b7a6662e8a3e57 (patch) | |
| tree | 91a5e6ac366cc5db18ae9341eedae42b37372fda /app/services/users/destroy_service.rb | |
| parent | 0788b37fba26ab7113ff4a580d3fb92c926299b7 (diff) | |
| download | gitlab-ce-b8e852429468154a2eda04b490b7a6662e8a3e57.tar.gz | |
Remove soft removals related coderemove-soft-removals-2
This removes all usage of soft removals except for the "pending delete"
system implemented for projects. This in turn simplifies all the query
plans of the models that used soft removals. Since we don't really use
soft removals for anything useful there's no point in keeping it around.
This _does_ mean that hard removals of issues (which only admins can do
if I'm not mistaken) can influence the "iid" values, but that code is
broken to begin with. More on this (and how to fix it) can be found in
https://gitlab.com/gitlab-org/gitlab-ce/issues/31114.
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37447
Diffstat (limited to 'app/services/users/destroy_service.rb')
| -rw-r--r-- | app/services/users/destroy_service.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/services/users/destroy_service.rb b/app/services/users/destroy_service.rb index 00db8a2c434..eace3dbeaea 100644 --- a/app/services/users/destroy_service.rb +++ b/app/services/users/destroy_service.rb @@ -51,11 +51,7 @@ module Users MigrateToGhostUserService.new(user).execute unless options[:hard_delete] - # Destroy the namespace after destroying the user since certain methods may depend on the namespace existing - user_data = user.destroy - namespace.really_destroy! - - user_data + user.destroy end end end |