tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
- `app/controllers/concerns/sign_in_token_authentication_concern.rb`:
  Conflict caused because of glitch-soc's theming system.
  Took upstream's new code and applied the theming system changes on top
  of it.
- `app/controllers/concerns/two_factor_authentication_concern.rb`:
  Conflict caused because of glitch-soc's theming system.
  Took upstream's new code and applied the theming system changes on top
  of it.
This commit is contained in:
Thibaut Girka
2020-11-14 00:30:36 +01:00
parent 8ffae82fa6 0a4d0e8320
commit de5cc20dd8
12 changed files with 192 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/workers/account_deletion_worker.rb
+2 -1
View File
@@ -5,7 +5,8 @@ class AccountDeletionWorker
sidekiq_options queue: 'pull'
def perform(account_id, reserve_username: true)
def perform(account_id, options = {})
reserve_username = options.with_indifferent_access.fetch(:reserve_username, true)
DeleteAccountService.new.call(Account.find(account_id), reserve_username: reserve_username, reserve_email: false)
rescue ActiveRecord::RecordNotFound
true