Commit Graph

9 Commits

Author SHA1 Message Date
David Huerta 4fb24a70d3 Merge branch 'master' into patch-1 2017-04-07 19:46:07 -04:00
David Huerta a7ab2204d4 Update Heroku-guide.md
Cleaning up the heroku admin command bit to match the form used in Administration-guide.md and clarify the wording a bit.
2017-04-07 17:44:32 -04:00
David Huerta 36a83cc4f9 Update Heroku-guide.md
Removing some of the confusion around what format S3 bucket names and regions should be entered as well as providing an example of an S3 policy that follows best security practices for this sort of thing.
2017-04-07 17:29:21 -04:00
Matt Jankowski 0f4fa59812 Update heroku instructions 2017-04-07 12:50:29 -04:00
Ash Furrow dd441606aa Updates instructions. 2017-04-04 20:53:31 -04:00
Ash Furrow 04225ed72e Adds instructions for adding admin users. 2017-04-04 18:45:24 -04:00
walfie c22388fc79 Fix typo in Heroku guide 2017-04-04 00:00:56 -04:00
Tom McAtee 68dba5f2eb Fixed the URL
Heroku uses the referrer URL to point at the repo that should be deployed; from this page that includes part of a path that breaks the deployment (specifically /blob/master/docs/Running-Mastodon/Heroku-guide.md).

I've replaced the vanilla address with one that includes a specific reference to the root of the repo
2017-02-14 12:46:18 +10:30
Effy Elden 92a98f73aa Add separate sections for Heroku and Vagrant deployments. Add guide for instance administration. Move 'Contribution guide' to 'Development guide'. 2017-01-22 19:50:40 +11:00