diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-11-14 12:59:06 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-11-14 12:59:06 +0300 |
| commit | 006c163b53d062d990ac213deac70978b0a927cc (patch) | |
| tree | 36dced4c3ba22fa3449e4b09c05bfa07a7eda003 /config | |
| parent | b44237f576e47b38299fab5a6d28aa49bc63970e (diff) | |
| parent | af941732ed92ad44a7568964e2a9191d0c72164c (diff) | |
Merge branch 'repository-name-emojis' into 'master'
Added ability to put emojis into repository name
## Are there points in the code the reviewer needs to double check?
Ensure that regexp used is correct, I used the following list: http://www.unicode.org/Public/emoji/1.0/emoji-data.txt
See merge request !7420
Diffstat (limited to 'config')
| -rw-r--r-- | config/database.yml.mysql | 12 |
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 |