Merge branch 'develop' of github.com:martini/zammad into develop
This commit is contained in:
commit
212dae4990
3 changed files with 22 additions and 14 deletions
|
@ -17,17 +17,3 @@ development:
|
||||||
username: some_user
|
username: some_user
|
||||||
password: some_pass
|
password: some_pass
|
||||||
host: 127.0.0.1
|
host: 127.0.0.1
|
||||||
|
|
||||||
# Warning: The database defined as "test" will be erased and
|
|
||||||
# re-generated from your development database when you run "rake".
|
|
||||||
# Do not set this db to the same as development or production.
|
|
||||||
test:
|
|
||||||
adapter: mysql2
|
|
||||||
database: zammad_test
|
|
||||||
pool: 50
|
|
||||||
timeout: 5000
|
|
||||||
encoding: utf8
|
|
||||||
username: some_user
|
|
||||||
password: some_pass
|
|
||||||
host: 127.0.0.1
|
|
||||||
|
|
||||||
|
|
11
config/database.yml.test-mysql
Normal file
11
config/database.yml.test-mysql
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
# Warning: The database defined as "test" will be erased and
|
||||||
|
# re-generated from your development database when you run "rake".
|
||||||
|
# Do not set this db to the same as development or production.
|
||||||
|
test:
|
||||||
|
adapter: mysql2
|
||||||
|
database: zammad_test
|
||||||
|
pool: 50
|
||||||
|
timeout: 5000
|
||||||
|
encoding: utf8
|
||||||
|
username: some_user
|
||||||
|
password: some_pass
|
11
config/database.yml.test-postgresql
Normal file
11
config/database.yml.test-postgresql
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
# Warning: The database defined as "test" will be erased and
|
||||||
|
# re-generated from your development database when you run "rake".
|
||||||
|
# Do not set this db to the same as development or production.
|
||||||
|
test:
|
||||||
|
adapter: postgresql
|
||||||
|
database: zammad_test
|
||||||
|
pool: 50
|
||||||
|
timeout: 5000
|
||||||
|
encoding: utf8
|
||||||
|
username: postgres
|
||||||
|
password:
|
Loading…
Reference in a new issue