summaryrefslogtreecommitdiff
path: root/config/database.yml.mysql
diff options
context:
space:
mode:
authorbogdanvlviv <bogdanvlviv@gmail.com>2017-03-27 00:10:27 +0300
committerbogdanvlviv <bogdanvlviv@gmail.com>2017-10-17 21:12:46 +0300
commitac3713e94784d56e3e860eda4dbced2a11bb2418 (patch)
treee110da4348abdc34da196a41b611151141413e28 /config/database.yml.mysql
parentb3f749036ea919de3982c81b157ab2d790ecb4c5 (diff)
downloadgitlab-ce-ac3713e94784d56e3e860eda4dbced2a11bb2418.tar.gz
Set 'staging specific' in database.yml.mysql
Diffstat (limited to 'config/database.yml.mysql')
-rw-r--r--config/database.yml.mysql21
1 files changed, 18 insertions, 3 deletions
diff --git a/config/database.yml.mysql b/config/database.yml.mysql
index eb71d3f5fe1..98c2abe9f5e 100644
--- a/config/database.yml.mysql
+++ b/config/database.yml.mysql
@@ -10,7 +10,7 @@ production:
pool: 10
username: git
password: "secure password"
- # host: localhost
+ host: localhost
# socket: /tmp/mysql.sock
#
@@ -25,7 +25,22 @@ development:
pool: 5
username: root
password: "secure password"
- # host: localhost
+ host: localhost
+ # socket: /tmp/mysql.sock
+
+#
+# Staging specific
+#
+staging:
+ adapter: mysql2
+ encoding: utf8
+ collation: utf8_general_ci
+ reconnect: false
+ database: gitlabhq_staging
+ pool: 10
+ username: git
+ password: "secure password"
+ host: localhost
# socket: /tmp/mysql.sock
# Warning: The database defined as "test" will be erased and
@@ -40,6 +55,6 @@ test: &test
pool: 5
username: root
password:
- # host: localhost
+ host: localhost
# socket: /tmp/mysql.sock
prepared_statements: false