mirror of
https://github.com/oonyeje/Pearlception_Website_RoR.git
synced 2025-12-25 03:37:40 +00:00
merge master into this branch
This commit is contained in:
commit
7b5503b5d3
@ -13,9 +13,9 @@ default: &default
|
||||
adapter: mysql2
|
||||
encoding: utf8
|
||||
pool: 5
|
||||
username: root
|
||||
password: terps
|
||||
socket: /var/run/mysqld/mysqld.sock
|
||||
username: <%= ENV['TEST_USER'] %>
|
||||
password: <%= ENV['TEST_PASS'] %>
|
||||
socket: <%= ENV['TEST_SOCKET'] %>
|
||||
|
||||
stats_development: &stats
|
||||
adapter: mysql2
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user