diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-02-05 18:06:00 -0800 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-02-05 18:06:00 -0800 |
| commit | 411bf8ca08fd32b3b44ed9c518623a78c8ab5404 (patch) | |
| tree | b0b4e567ad0426ff56a08308f6ab0371f2ce05f7 | |
| parent | e19bac4caf0b81b6350dc94375842f152903d6b0 (diff) | |
| parent | eb390226749cf23e50fbae614b88533ea660b2e8 (diff) | |
| download | gitlab-ce-411bf8ca08fd32b3b44ed9c518623a78c8ab5404.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
| -rw-r--r-- | doc/update/7.3-to-7.4.md | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/doc/update/7.3-to-7.4.md b/doc/update/7.3-to-7.4.md index 62bd98832c2..085cb80a97f 100644 --- a/doc/update/7.3-to-7.4.md +++ b/doc/update/7.3-to-7.4.md @@ -68,14 +68,17 @@ git diff origin/7-3-stable:config/gitlab.yml.example origin/7-4-stable:config/gi sudo -u git -H editor config/unicorn.rb ``` -#### Change nginx https settings +#### Change Nginx HTTPS settings * HTTPS setups: Make `/etc/nginx/sites-available/gitlab-ssl` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-4-stable/lib/support/nginx/gitlab-ssl but with your setting #### MySQL Databases: Update database.yml config file -* Add `collation: utf8_general_ci` to config/database.yml as seen in [config/database.yml.mysql](config/database.yml.mysql) +* Add `collation: utf8_general_ci` to `config/database.yml` as seen in [config/database.yml.mysql](/config/database.yml.mysql) +``` +sudo -u git -H editor config/database.yml +``` ### 5. Start application |