diff --git a/docs/DEVELOPMENT-OSX-NATIVE.md b/docs/DEVELOPMENT-OSX-NATIVE.md index ec4ae1ecefe..44f161fe9e2 100644 --- a/docs/DEVELOPMENT-OSX-NATIVE.md +++ b/docs/DEVELOPMENT-OSX-NATIVE.md @@ -99,7 +99,6 @@ Atlassian has a free Git client for OS X called [SourceTree](http://www.sourcetr ## Postgres 9.3 OS X ships with Postgres 9.1.5, but you're better off going with the latest from Homebrew or [Postgres.app](http://postgresapp.com). -Note that we currently do not support Postgres 10 [due to an issue with seed-fu](https://meta.discourse.org/t/discourse-appears-to-be-broken-with-postgres-10/71723). ### Using Postgres.app diff --git a/docs/TROUBLESHOOTING.md b/docs/TROUBLESHOOTING.md index adb391c367e..719bfc0b2f5 100644 --- a/docs/TROUBLESHOOTING.md +++ b/docs/TROUBLESHOOTING.md @@ -4,9 +4,9 @@ Are you having trouble setting up Discourse? Here are some basic things to check reaching out to the community for help: -1. Are you running Ruby 2.0 or later? +1. Are you running Ruby 2.4 or later? - Discourse is designed for Ruby 2.0 or later. We recommend 2.0.0 p353 or later. You can check your version by typing + Discourse is designed for Ruby 2.4 or later. We recommend 2.4.4 p296 or later. You can check your version by typing `ruby -v` and checking the response. @@ -31,12 +31,12 @@ reaching out to the community for help: 5. Have you migrated your database? Our schema changes fairly frequently. After checking out the source code, you should - run `rake db:migrate` + run `bundle exec rake db:migrate && RAILS_ENV=test bundle exec rake db:migrate` 7. Do the tests pass? If you are having other problems, it's useful to know if the test suite passes. You - can run it by first using `rake db:test:prepare` and then `rake spec`. If you + can run it by first using `RAILS_ENV=test bundle exec rake db:drop db:create db:migrate` and then `bundle exec rspec`. If you experience any failures, that's a bad sign! Our master branch should *always* pass every test.