Skip to content

G
gitlab-ce
Commit a8fc10e3 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files
Options

Merge pull request #7317 from drpdigitalmedia/master 

set the collation to utf8_general_ci
parents 66955bba d3f5a0c6
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
config/database.yml.mysql
View file @ a8fc10e3
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
production: production:
adapter: mysql2 adapter: mysql2
encoding: utf8 encoding: utf8
collation: utf8_general_ci
reconnect: false reconnect: false
database: gitlabhq_production database: gitlabhq_production
pool: 10 pool: 10
...@@ -18,6 +19,7 @@ production: ...@@ -18,6 +19,7 @@ production:
development: development:
adapter: mysql2 adapter: mysql2
encoding: utf8 encoding: utf8
collation: utf8_general_ci
reconnect: false reconnect: false
database: gitlabhq_development database: gitlabhq_development
pool: 5 pool: 5
...@@ -31,6 +33,7 @@ development: ...@@ -31,6 +33,7 @@ development:
test: &test test: &test
adapter: mysql2 adapter: mysql2
encoding: utf8 encoding: utf8
collation: utf8_general_ci
reconnect: false reconnect: false
database: gitlabhq_test database: gitlabhq_test
pool: 5 pool: 5
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7