Merge branch 'master' into patch-1

This commit is contained in:
David Huerta 2017-04-07 19:46:07 -04:00 committed by GitHub
commit e8e607a356
3 changed files with 4 additions and 5 deletions

View file

@ -7,7 +7,7 @@ So, you have a working Mastodon instance... now what?
The following rake task:
rake mastodon:make_admin USERNAME=alice
RAILS_ENV=production bundle exec rails mastodon:make_admin USERNAME=alice
Would turn the local user "alice" into an admin.

View file

@ -81,8 +81,6 @@ You can deploy from the Heroku web interface or from the command line. Run:
after you first deploy to set up the first database.
You may need to use the `heroku` CLI application to run:
To make yourself an admin, you may need to use the `heroku` CLI application after creating an account online:
`USERNAME=yourUsername rails mastodon:make_admin`
to make yourself an admin.
`heroku rake mastodon:make_admin USERNAME=yourUsername`

View file

@ -13,5 +13,6 @@ Some people have started working on apps for the Mastodon API. Here is a list of
|Albatross|iOS||[@goldie_ice@mastodon.social](https://mastodon.social/users/goldie_ice)|
|Tooter|Chrome|<https://github.com/ineffyble/tooter>|[@effy@mastodon.social](https://mastodon.social/users/effy)|
|tootstream|CLI|<https://github.com/magicalraccoon/tootstream>|[@Raccoon@mastodon.social](https://mastodon.social/users/Raccoon)|
|HackerNewsBot|CLI|<https://github.com/raymestalez/mastodon-hnbot>|[@rayalez@hackertribe.io](https://hackertribe.io/users/rayalez)|
If you have a project like this, let me know so I can add it to the list!