diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-07-19 12:09:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-19 12:09:41 +0200 |
| commit | a2df067f9852f0db3140dd2c35539f4e74bdb6dc (patch) | |
| tree | c18376b570831e1595362f001341599f1a5a8a36 /app/models | |
| parent | e42ed4502f9e4a599ecf7a860b7de80090ba46ad (diff) | |
| parent | d1c87be8cf0837f96290b5c2e127b7ce2e3dbb41 (diff) | |
Merge pull request #1569 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/account.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index 96f23979f..3178a0f9c 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -236,11 +236,11 @@ class Account < ApplicationRecord suspended? && deletion_request.present? end - def suspend!(date: Time.now.utc, origin: :local) + def suspend!(date: Time.now.utc, origin: :local, block_email: true) transaction do create_deletion_request! update!(suspended_at: date, suspension_origin: origin) - create_canonical_email_block! + create_canonical_email_block! if block_email end end |