Merge branch 'main' into glitch-soc/merge-upstream

2021-07-17 17:45:35 +02:00
parent e42ed4502f e54a65013d
commit d1c87be8cf
8 changed files with 19 additions and 36 deletions
--- a/app/controllers/settings/deletes_controller.rb
+++ b/app/controllers/settings/deletes_controller.rb
@ -42,7 +42,7 @@ class Settings::DeletesController < Settings::BaseController
  end

  def destroy_account!
-    current_account.suspend!(origin: :local)
+    current_account.suspend!(origin: :local, block_email: false)
    AccountDeletionWorker.perform_async(current_user.account_id)
    sign_out
  end