diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-23 21:33:33 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-23 21:33:33 +0300 |
| commit | a8fc10e3d0ca128daf0568857f1efc9b03c2e6fb (patch) | |
| tree | a831d45545e00e5bc5ceaad618c8e63351cb5860 /config | |
| parent | 66955bba386fcd3f7a2159b911f1fcc8dfbff45a (diff) | |
| parent | d3f5a0c67f029441537d4f64040bf6454b999120 (diff) | |
| download | gitlab-ce-a8fc10e3d0ca128daf0568857f1efc9b03c2e6fb.tar.gz | |
Merge pull request #7317 from drpdigitalmedia/master
set the collation to utf8_general_ci
Diffstat (limited to 'config')
| -rw-r--r-- | config/database.yml.mysql | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/database.yml.mysql b/config/database.yml.mysql index 55ac088bc1d..a99c50706c5 100644 --- 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 |