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

2019-01-20 16:49:23 +01:00
parent aa362ab73d 31e7940de5
commit 9dfbcf941e
37 changed files with 492 additions and 64 deletions
--- a/lib/mastodon/accounts_cli.rb
+++ b/lib/mastodon/accounts_cli.rb
@@ -176,7 +176,7 @@ module Mastodon
      end

      say("Deleting user with #{account.statuses_count} statuses, this might take a while...")
-      SuspendAccountService.new.call(account, remove_user: true)
+      SuspendAccountService.new.call(account, including_user: true)
      say('OK', :green)
    end

--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -21,7 +21,7 @@ module Mastodon
    end

    def flags
-      'rc3'
+      ''
    end

    def to_a