diff options
Diffstat (limited to 'config/database.yml.mysql')
| -rw-r--r-- | config/database.yml.mysql | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/config/database.yml.mysql b/config/database.yml.mysql index 0547d4ac8fa..99cd7eaa5cf 100644 --- a/config/database.yml.mysql +++ b/config/database.yml.mysql @@ -1,3 +1,21 @@ +# +# PRODUCTION +# +production: + adapter: mysql2 + encoding: utf8 + reconnect: false + database: gitlabhq_production + pool: 5 + username: root + password: "secure password" + # socket: /tmp/mysql.sock + + +# +# Development specific +# +# development: adapter: mysql2 encoding: utf8 @@ -11,7 +29,7 @@ development: # 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: +test: &test adapter: mysql2 encoding: utf8 reconnect: false @@ -21,12 +39,5 @@ test: password: # socket: /tmp/mysql.sock -production: - adapter: mysql2 - encoding: utf8 - reconnect: false - database: gitlabhq_production - pool: 5 - username: root - password: "secure password" - # socket: /tmp/mysql.sock +cucumber: + <<: *test |