Merge branch 'master' of github.com:martini/zammad
This commit is contained in:
commit
4b4df15235
2 changed files with 10 additions and 0 deletions
|
@ -19,6 +19,16 @@ test:
|
||||||
timeout: 5000
|
timeout: 5000
|
||||||
pool: 50
|
pool: 50
|
||||||
|
|
||||||
|
test_mysql:
|
||||||
|
adapter: mysql2
|
||||||
|
database: zammad_test
|
||||||
|
pool: 50
|
||||||
|
timeout: 5000
|
||||||
|
encoding: utf8
|
||||||
|
username: zammad_test
|
||||||
|
password: zammad_test
|
||||||
|
host: 127.0.0.1
|
||||||
|
|
||||||
production:
|
production:
|
||||||
adapter: mysql2
|
adapter: mysql2
|
||||||
database: zammad_prod
|
database: zammad_prod
|
||||||
|
|
0
config/environments/test_mysql.rb
Normal file
0
config/environments/test_mysql.rb
Normal file
Loading…
Reference in a new issue