Merge branch 'master' into cd-v3-parity

2015-12-01 15:10:35 +01:00 · 2015-12-01 15:10:35 +01:00 · c0d562cb7d
commit c0d562cb7d
parent 50e198beee 2b8d7e420b
1 changed files with 2 additions and 1 deletions
--- a/README.md
+++ b/README.md
@ -17,7 +17,8 @@ This is the app running on https://api.travis-ci.org/

 ### Database setup

-1. `rake db:create db:structure:load`
+1. `rake db:create db:migrate`
+2. for testing 'RAILS_ENV=test bundle exec rake db:create db:migrate --trace'
 1. Clone `travis-logs` and copy the `logs` database (assume the PostgreSQL user is `postgres`):
 ```sh-session
 cd ..