Commit 8115c67f authored by Rémy Coutable's avatar Rémy Coutable

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
parents b20dc47a 7ffd0d3b
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
# #
production: production:
adapter: mysql2 adapter: mysql2
encoding: utf8mb4 encoding: utf8
collation: utf8mb4_general_ci collation: utf8_general_ci
reconnect: false reconnect: false
database: gitlabhq_production database: gitlabhq_production
pool: 10 pool: 10
...@@ -18,8 +18,8 @@ production: ...@@ -18,8 +18,8 @@ production:
# #
development: development:
adapter: mysql2 adapter: mysql2
encoding: utf8mb4 encoding: utf8
collation: utf8mb4_general_ci collation: utf8_general_ci
reconnect: false reconnect: false
database: gitlabhq_development database: gitlabhq_development
pool: 5 pool: 5
......
This diff is collapsed.
...@@ -97,6 +97,8 @@ sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production ...@@ -97,6 +97,8 @@ sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS_ENV=production sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS_ENV=production
``` ```
**MySQL installations**: Run through the `MySQL strings limits` and `Tables and data conversion to utf8mb4` [tasks](../install/database_mysql.md).
### 6. Update gitlab-workhorse ### 6. Update gitlab-workhorse
Install and compile gitlab-workhorse. This requires Install and compile gitlab-workhorse. This requires
......
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