Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-03-17 17:17:21 +00:00
parent fe17446af0 566ace2d64
commit 9341b982b6
8 changed files with 42 additions and 12 deletions
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@@ -472,7 +472,7 @@ namespace :mastodon do

        if user.save
          prompt.ok 'User created and confirmation mail sent to the user\'s email address.'
-          prompt.ok "Here is the random password generated for the user: #{password}"
+          prompt.ok "Here is the random password generated for the user: #{user.password}"
        else
          prompt.warn 'User was not created because of the following errors:'