summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorVincent Composieux <vincent.composieux@gmail.com>2016-11-11 12:27:23 +0100
committerVincent Composieux <vincent.composieux@gmail.com>2016-11-12 09:21:23 +0100
commitaf941732ed92ad44a7568964e2a9191d0c72164c (patch)
tree895fff0839f8077fa8e403e6e5f360266b55d24c /config
parentd96ec63e80dadca566785ccc670204e7fe433c90 (diff)
downloadgitlab-ce-af941732ed92ad44a7568964e2a9191d0c72164c.tar.gz
Added ability to put emojis into repository name
Added ability to put emojis into repository name
Diffstat (limited to 'config')
-rw-r--r--config/database.yml.mysql12
1 files changed, 6 insertions, 6 deletions
diff --git a/config/database.yml.mysql b/config/database.yml.mysql
index a99c50706c5..d9702870249 100644
--- a/config/database.yml.mysql
+++ b/config/database.yml.mysql
@@ -3,8 +3,8 @@
#
production:
adapter: mysql2
- encoding: utf8
- collation: utf8_general_ci
+ encoding: utf8mb4
+ collation: utf8mb4_general_ci
reconnect: false
database: gitlabhq_production
pool: 10
@@ -18,8 +18,8 @@ production:
#
development:
adapter: mysql2
- encoding: utf8
- collation: utf8_general_ci
+ encoding: utf8mb4
+ collation: utf8mb4_general_ci
reconnect: false
database: gitlabhq_development
pool: 5
@@ -32,8 +32,8 @@ development:
# Do not set this db to the same as development or production.
test: &test
adapter: mysql2
- encoding: utf8
- collation: utf8_general_ci
+ encoding: utf8mb4
+ collation: utf8mb4_general_ci
reconnect: false
database: gitlabhq_test
pool: 5