Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Simon <ipernet@gmail.com>2017-01-09 21:37:58 +0300
committerGuillaume Simon <ipernet@gmail.com>2017-01-13 00:32:55 +0300
commit7ffd0d3be83caecdec54edfacaa31971f885079f (patch)
tree418928a5a91f9e76e5c462b0019883034dc57bf2 /config/database.yml.mysql
parent707570ac7de4867a62ad4c94c95e43e8ca0afbcb (diff)
Gitlab from sources : proper utf8mb4 support for MySQL 5.5 to 5.7
Diffstat (limited to 'config/database.yml.mysql')
-rw-r--r--config/database.yml.mysql8
1 files changed, 4 insertions, 4 deletions
diff --git a/config/database.yml.mysql b/config/database.yml.mysql
index d9702870249..a33e40e8eb3 100644
--- a/config/database.yml.mysql
+++ b/config/database.yml.mysql
@@ -3,8 +3,8 @@
#
production:
adapter: mysql2
- encoding: utf8mb4
- collation: utf8mb4_general_ci
+ encoding: utf8
+ collation: utf8_general_ci
reconnect: false
database: gitlabhq_production
pool: 10
@@ -18,8 +18,8 @@ production:
#
development:
adapter: mysql2
- encoding: utf8mb4
- collation: utf8mb4_general_ci
+ encoding: utf8
+ collation: utf8_general_ci
reconnect: false
database: gitlabhq_development
pool: 5