Merge branch 'master' of github.com:martini/zammad

2013-01-04 15:31:10 +01:00 · 2013-01-04 15:31:10 +01:00 · 4b4df15235
parent 743d538e1f 852e47c474
commit 4b4df15235
2 changed files with 10 additions and 0 deletions
--- a/config/database.yml
+++ b/config/database.yml
@ -18,6 +18,16 @@ test:
  database: db/test.sqlite3
  timeout: 5000
  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:
  adapter: mysql2
--- a/config/environments/test_mysql.rb
+++ b/config/environments/test_mysql.rb