diff options
| author | ThibG <thib@sitedethib.com> | 2019-09-15 14:45:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-15 14:45:24 +0200 |
| commit | 221bb05cf8d30d7912fd1f860af2552ff7914fd2 (patch) | |
| tree | 88ac4e45536fe772a1c47bdf6df27c6ad19a016f /app/controllers/admin/accounts_controller.rb | |
| parent | c7f71b974f1a57cd93f86e5a678018d4aea8e728 (diff) | |
| parent | b83e2df6b59ccd7cbe8f9145e06b75547dc1101a (diff) | |
Merge pull request #1219 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/admin/accounts_controller.rb')
| -rw-r--r-- | app/controllers/admin/accounts_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/accounts_controller.rb b/app/controllers/admin/accounts_controller.rb index 2fa1dfe5f..68b6352f8 100644 --- a/app/controllers/admin/accounts_controller.rb +++ b/app/controllers/admin/accounts_controller.rb @@ -41,7 +41,7 @@ module Admin def reject authorize @account.user, :reject? - SuspendAccountService.new.call(@account, including_user: true, destroy: true, skip_distribution: true) + SuspendAccountService.new.call(@account, reserve_email: false, reserve_username: false) redirect_to admin_pending_accounts_path end |