diff options
| author | Nick Thomas <nick@gitlab.com> | 2017-06-02 13:35:37 +0100 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2017-06-05 17:48:57 +0100 |
| commit | f09b7f56077f8b1deb88dd565717e8ed0d8e6aee (patch) | |
| tree | f43fadbe24c6377a7252474d91d7adcca947e9df /app/controllers/admin | |
| parent | 158581a447bb4976161eca26ddcb2fccd25888ab (diff) | |
| download | gitlab-ce-f09b7f56077f8b1deb88dd565717e8ed0d8e6aee.tar.gz | |
Support hard deletion in Admin::UsersController#destroy
Diffstat (limited to 'app/controllers/admin')
| -rw-r--r-- | app/controllers/admin/users_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index 563bcc65bd6..bace99dad58 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -138,7 +138,7 @@ class Admin::UsersController < Admin::ApplicationController end def destroy - DeleteUserWorker.perform_async(current_user.id, user.id) + user.delete_async(deleted_by: current_user, params: params.permit(:hard_delete)) respond_to do |format| format.html { redirect_to admin_users_path, notice: "The user is being deleted." } |