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

2019-09-05 11:36:41 +02:00
parent 0128509605 e265b8887d
commit 5088eb8388
55 changed files with 635 additions and 237 deletions
--- a/app/services/suspend_account_service.rb
+++ b/app/services/suspend_account_service.rb
@ -61,6 +61,7 @@ class SuspendAccountService < BaseService
    return if !@account.local? || @account.user.nil?

    if @options[:including_user]
+      @options[:destroy] = true if !@account.user_confirmed? || @account.user_pending?
      @account.user.destroy
    else
      @account.user.disable!