diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-01-26 14:54:52 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-01-26 14:54:52 +0000 |
| commit | 8115c67fd2850c5b3d0294ac652c49ed54f9e740 (patch) | |
| tree | 89a6189f9de1342abc392c3c90f948a322de111b /config | |
| parent | b20dc47a3127121751b490cbe782a669e2c82753 (diff) | |
| parent | 7ffd0d3be83caecdec54edfacaa31971f885079f (diff) | |
| download | gitlab-ce-8115c67fd2850c5b3d0294ac652c49ed54f9e740.tar.gz | |
Merge branch 'mysql-sources-utf8mb4-fix' into 'master'
Gitlab from sources : proper utf8mb4 support for MySQL 5.5 to 5.7
See merge request !8508
Diffstat (limited to 'config')
| -rw-r--r-- | config/database.yml.mysql | 8 |
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 |