diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-12-07 10:50:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-07 10:50:52 +0100 |
| commit | 0194bd33fe4294ef6c1af34e907360f2980155c8 (patch) | |
| tree | 39b966d8c051d08eff2ddf203051dc91ad15e01a /app/controllers/api/v1/admin | |
| parent | fe523a304520a09f6371f45bd63b9e8988776c03 (diff) | |
| parent | 16fb604c52a84a48bb729ea15e7fa8c9568ae118 (diff) | |
Merge pull request #1995 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/api/v1/admin')
| -rw-r--r-- | app/controllers/api/v1/admin/accounts_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/api/v1/admin/accounts_controller.rb b/app/controllers/api/v1/admin/accounts_controller.rb index ae7f7d076..f48300072 100644 --- a/app/controllers/api/v1/admin/accounts_controller.rb +++ b/app/controllers/api/v1/admin/accounts_controller.rb @@ -54,12 +54,14 @@ class Api::V1::Admin::AccountsController < Api::BaseController def approve authorize @account.user, :approve? @account.user.approve! + log_action :approve, @account.user render json: @account, serializer: REST::Admin::AccountSerializer end def reject authorize @account.user, :reject? DeleteAccountService.new.call(@account, reserve_email: false, reserve_username: false) + log_action :reject, @account.user render_empty end |