Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions shared/config/application.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
default: &default
DB_NAME: "#{app_name}"
DB_HOST: "localhost"
DB_PORT: "5432"
USERNAME: "postgres"
Expand All @@ -8,11 +9,9 @@ default: &default

development:
<<: *default
DB_NAME: "#{app_name}_development"
SECRET_KEY_BASE: "#{secret_key_base}"

test:
<<: *default
DB_NAME: "#{app_name}_test"
TEST_RETRY: "0"
SECRET_KEY_BASE: "#{secret_key_base}"
4 changes: 2 additions & 2 deletions shared/config/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ development:
host: <%= ENV['DB_HOST'] %>
port: <%= ENV['DB_PORT'] %>
username: <%= ENV['USERNAME'] %>
database: <%= ENV['DB_NAME'] %>
database: <%= ENV['DB_NAME'] %>_development

test:
<<: *default
host: <%= ENV['DB_HOST'] %>
port: <%= ENV['DB_PORT'] %>
username: <%= ENV['USERNAME'] %>
database: <%= ENV['DB_NAME'] %>
database: <%= ENV['DB_NAME'] %>_test

production:
url: <%= ENV['DATABASE_URL'] %>