Merge branch 'update-config-db' of nicolas/mmsc_app into master

This commit is contained in:
thibault 2020-07-06 16:50:23 +02:00 committed by Gogs
commit c72ca9e5ed
2 changed files with 175 additions and 175 deletions

View File

@ -7,7 +7,6 @@
default: &default default: &default
adapter: mysql2 adapter: mysql2
encoding: utf8mb4 encoding: utf8mb4
database: mmsc_app
pool: 5 pool: 5
timeout: 5000 timeout: 5000
variables: variables:
@ -15,15 +14,16 @@ default: &default
development: development:
<<: *default <<: *default
database: mmsc_app_development
username: root username: root
socket: /tmp/mysql.sock
# Warning: The database defined as "test" will be erased and # Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake". # re-generated from your development database when you run "rake".
# Do not set this db to the same as development or production. # Do not set this db to the same as development or production.
test: test:
<<: *default <<: *default
database: db/test.sqlite3 database: mmsc_app_test
username: root
production: production:
<<: *default <<: *default

File diff suppressed because it is too large Load Diff