diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-10-18 11:52:04 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-10-18 11:52:04 -0500 |
| commit | 42e8c8eb0e9964d157ac160b3f816e58a771f045 (patch) | |
| tree | c3f044eacc21ff65d9cb1bf20d111aaff6c86074 /config/database.yml | |
| parent | 4421f6598f5883908fb25743977306f19a0b0f0f (diff) | |
| parent | 09d81defcda96eae7ffba36ccf1fb091ce08f17b (diff) | |
Merge tag 'v2.0.0' into gs-master
Diffstat (limited to 'config/database.yml')
| -rw-r--r-- | config/database.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/database.yml b/config/database.yml index f74635a36..82e560515 100644 --- a/config/database.yml +++ b/config/database.yml @@ -6,7 +6,7 @@ default: &default development: <<: *default - database: mastodon_development + database: <%= ENV['DB_NAME'] || 'mastodon_development' %> username: <%= ENV['DB_USER'] %> password: <%= ENV['DB_PASS'] %> host: <%= ENV['DB_HOST'] %> @@ -17,7 +17,7 @@ development: # Do not set this db to the same as development or production. test: <<: *default - database: mastodon_test<%= ENV['TEST_ENV_NUMBER'] %> + database: <%= ENV['DB_NAME'] || 'mastodon' %>_test<%= ENV['TEST_ENV_NUMBER'] %> username: <%= ENV['DB_USER'] %> password: <%= ENV['DB_PASS'] %> host: <%= ENV['DB_HOST'] %> |