diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-04-03 14:15:12 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-04-03 14:15:12 +0000 |
commit | ff3703f5e6e386d28790c3b395341bcf15b04c13 (patch) | |
tree | 8d8c29179ac25b472d751e237b6bb86ba05b67cc /lib | |
parent | dcbd090cba92872e55528ecf7f7adffd3ffe70f7 (diff) | |
parent | 6a2d022d1d578f8957736de2fb895069c24c072b (diff) | |
download | gitlab-ce-ff3703f5e6e386d28790c3b395341bcf15b04c13.tar.gz |
Merge branch 'sh-fix-destroy-user-race' into 'master'
Fix race condition where a namespace would be deleted before a project was deleted
Closes #30334 and #30306
See merge request !10389
Diffstat (limited to 'lib')
-rw-r--r-- | lib/api/users.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/users.rb b/lib/api/users.rb index a4201fe6fed..530ca0b5235 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -293,7 +293,7 @@ module API user = User.find_by(id: params[:id]) not_found!('User') unless user - ::Users::DestroyService.new(current_user).execute(user) + DeleteUserWorker.perform_async(current_user.id, user.id) end desc 'Block a user. Available only for admins.' |