diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-06-05 19:22:08 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-06-05 19:22:08 +0000 |
| commit | 7c23c6af6f185c6f1a41af4c46daf6d0fc41ee82 (patch) | |
| tree | 1590d1719a597a12a9351216c879e970b46a32f5 /lib | |
| parent | 43dcb0afdbf1f1a80f94580301cbafc9dbd772e6 (diff) | |
| parent | 2cbe716a54753757982a800d8196b0480d699504 (diff) | |
| download | gitlab-ce-7c23c6af6f185c6f1a41af4c46daf6d0fc41ee82.tar.gz | |
Merge branch '28694-hard-delete-user-from-admin-panel' into 'master'
Allow users to be hard-deleted from the admin panel
Closes #28694
See merge request !11874
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 2070dbd8bc7..e8694e90cf2 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 - DeleteUserWorker.perform_async(current_user.id, user.id, hard_delete: params[:hard_delete]) + user.delete_async(deleted_by: current_user, params: params) end desc 'Block a user. Available only for admins.' |