From 371864c39ec8c7fcaa40d907f7b045a302a7f028 Mon Sep 17 00:00:00 2001 From: zorun Date: Thu, 27 Apr 2017 11:15:53 +0200 Subject: [PATCH] Development: Fix bundle install instructions and expand on running rails (#133) --- Running-Mastodon/Development-guide.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Running-Mastodon/Development-guide.md b/Running-Mastodon/Development-guide.md index 81d4a4e4..4b2431e5 100644 --- a/Running-Mastodon/Development-guide.md +++ b/Running-Mastodon/Development-guide.md @@ -11,9 +11,9 @@ In fact, all you need is described in the [production guide](Production-guide.md - To prefix any commands with `RAILS_ENV=production` since the default environment is "development" anyway - Any cronjobs -The command to install Ruby project dependencies does not require any flags, i.e. simply +The command to install Ruby project dependencies is the following: - bundle install + bundle install --with development Similarly, installing JavaScript dependencies doesn't require any flags: @@ -21,9 +21,13 @@ Similarly, installing JavaScript dependencies doesn't require any flags: By default the development environment wants to connect to a `mastodon_development` database on localhost using your user/ident to login to Postgres (i.e. not a md5 password) -You can run Mastodon with: +To setup the `mastodon_development` database, run: - rails s + bundle exec rails db:setup + +You can then run Mastodon with: + + bundle exec rails server And open `http://localhost:3000` in your browser. Background jobs run inline (aka synchronously) in the development environment, so you don't need to run a Sidekiq process.