Merge commit '8e514b1965
' into kb_migration
This commit is contained in:
commit
b86e6662dd
4 changed files with 89 additions and 25 deletions
|
@ -102,7 +102,7 @@ module Mastodon
|
|||
say('Use --force to reattach it anyway and delete the other user')
|
||||
return
|
||||
elsif account.user.present?
|
||||
DeleteAccountService.new.call(account, reserve_email: false)
|
||||
DeleteAccountService.new.call(account, reserve_email: false, reserve_username: false)
|
||||
account = Account.new(username: username)
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue