diff options
| author | imncls <himasoto@gmail.com> | 2018-02-23 23:28:31 +0900 |
|---|---|---|
| committer | imncls <himasoto@gmail.com> | 2018-02-23 23:28:31 +0900 |
| commit | bb6988a7ac319c08776d8c07204232a67f992671 (patch) | |
| tree | 4a53349374bc4a871a6ce74b786a8e747803155c /lib/tasks | |
| parent | 544543e40a723d9719f5571bd4c3455a6a69fccd (diff) | |
| parent | e668180044560e28bdc5eef94744c210013efcda (diff) | |
Merge branch 'master' of https://github.com/tootsuite/mastodon
# Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.rb
Diffstat (limited to 'lib/tasks')
| -rw-r--r-- | lib/tasks/mastodon.rake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake index e144621e5..d2e4f38a9 100644 --- a/lib/tasks/mastodon.rake +++ b/lib/tasks/mastodon.rake @@ -752,6 +752,7 @@ namespace :mastodon do if [404, 410].include?(res.code) if options[:force] + SuspendAccountService.new.call(account) account.destroy else progress_bar.pause @@ -764,6 +765,7 @@ namespace :mastodon do if confirm.casecmp('n').zero? next else + SuspendAccountService.new.call(account) account.destroy end end |