From 1ee3f14a9781a0d57fe6226cd40178d650f6ab27 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Mon, 3 Apr 2017 14:15:12 +0000 Subject: 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 --- lib/api/users.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/api/users.rb') diff --git a/lib/api/users.rb b/lib/api/users.rb index 549003f576a..a309be9d0fa 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -312,7 +312,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.' -- cgit v1.2.1