Merge pull request #7317 from drpdigitalmedia/master

set the collation to utf8_general_ci

Merge pull request #7317 from drpdigitalmedia/master
set the collation to utf8_general_ci
a8fc10e3 · Dmitriy Zaporozhets · 66955bba · d3f5a0c6 · a8fc10e3
隐藏空白更改
内联并排

Showing with 3 addition and 0 deletion

config/database.yml.mysql config/database.yml.mysql +3 -0

未找到文件。
--- a/config/database.yml.mysql
+++ b/config/database.yml.mysql
@@ -4,6 +4,7 @@
 production:
  adapter: mysql2
  encoding: utf8
+  collation: utf8_general_ci
  reconnect: false
  database: gitlabhq_production
  pool: 10
@@ -18,6 +19,7 @@ production:
 development:
  adapter: mysql2
  encoding: utf8
+  collation: utf8_general_ci
  reconnect: false
  database: gitlabhq_development
  pool: 5
@@ -31,6 +33,7 @@ development:
 test: &test
  adapter: mysql2
  encoding: utf8
+  collation: utf8_general_ci
  reconnect: false
  database: gitlabhq_test
  pool: 5