diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-12-18 11:44:54 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2021-12-18 11:44:54 +0100 |
commit | d4f315f3044f69dfe64fbfd2348fcaa5deb2aa5e (patch) | |
tree | e3684038c30aef2dd3a0c9b5ec76de83e043663c /app/controllers/admin/accounts_controller.rb | |
parent | 7efef7db9ed6f7b25a28166c1b75a28adbaf7cdb (diff) | |
parent | 76761d5fc0886e44a7a6eb94ab62aae8204d9e6e (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app/controllers/admin/accounts_controller.rb')
-rw-r--r-- | app/controllers/admin/accounts_controller.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/app/controllers/admin/accounts_controller.rb b/app/controllers/admin/accounts_controller.rb index 948e70d5b..0786985fa 100644 --- a/app/controllers/admin/accounts_controller.rb +++ b/app/controllers/admin/accounts_controller.rb @@ -117,6 +117,16 @@ module Admin redirect_to admin_account_path(@account.id), notice: I18n.t('admin.accounts.removed_header_msg', username: @account.acct) end + def unblock_email + authorize @account, :unblock_email? + + CanonicalEmailBlock.where(reference_account: @account).delete_all + + log_action :unblock_email, @account + + redirect_to admin_account_path(@account.id), notice: I18n.t('admin.accounts.unblocked_email_msg', username: @account.acct) + end + private def set_account |