diff options
author | pluralcafe-docker <git@plural.cafe> | 2019-01-21 21:32:31 +0000 |
---|---|---|
committer | pluralcafe-docker <git@plural.cafe> | 2019-01-21 21:32:31 +0000 |
commit | 50dc62ea3a36039463032aa2e712471859d9d9b6 (patch) | |
tree | e4399c6ca2b7e7b6f83bb0704a2b092ca9b79c1f /lib | |
parent | b7c67605d5c2110b4a3cd3d8a7b8ef2878cbfe48 (diff) | |
parent | 6f53c4fc79ea7abd40b7fc224cecd8be63135b08 (diff) |
Merge branch 'glitch'
Diffstat (limited to 'lib')
-rw-r--r-- | lib/mastodon/accounts_cli.rb | 2 | ||||
-rw-r--r-- | lib/mastodon/version.rb | 2 | ||||
-rw-r--r-- | lib/tasks/repo.rake | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/lib/mastodon/accounts_cli.rb b/lib/mastodon/accounts_cli.rb index 24fb67991..dca31cdca 100644 --- 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 diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index 90514d78c..328159fd3 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -21,7 +21,7 @@ module Mastodon end def flags - 'rc3' + '' end def to_a diff --git a/lib/tasks/repo.rake b/lib/tasks/repo.rake index 263cca84c..8ceec3085 100644 --- a/lib/tasks/repo.rake +++ b/lib/tasks/repo.rake @@ -5,6 +5,9 @@ namespace :repo do task :authors do file = File.open(Rails.root.join('AUTHORS.md'), 'w') file << <<~HEADER + Authors + ======= + Mastodon is available on [GitHub](https://github.com/tootsuite/mastodon) and provided thanks to the work of the following contributors: |