diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-04-01 21:28:31 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-04-01 21:28:31 +0200 |
| commit | 12dae9d58316bec32adaac016998ab1cf69d2b45 (patch) | |
| tree | 4ddadcc66d07a1edfcfb9ff0f9cda7cf107d6b46 /lib | |
| parent | 925830d11bb5c132e282f82bdb2ca893d87c9c24 (diff) | |
| parent | 120544067fcca4bf6e71ba1ffb276c451c17c656 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/models/form/admin_settings.rb - config/locales/ja.yml
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mastodon/accounts_cli.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/mastodon/accounts_cli.rb b/lib/mastodon/accounts_cli.rb index dca31cdca..f02b2149b 100644 --- a/lib/mastodon/accounts_cli.rb +++ b/lib/mastodon/accounts_cli.rb @@ -236,11 +236,7 @@ module Mastodon end if [404, 410].include?(code) - unless options[:dry_run] - SuspendAccountService.new.call(account) - account.destroy - end - + SuspendAccountService.new.call(account, destroy: true) unless options[:dry_run] culled += 1 say('+', :green, false) else |