diff options
| author | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-02-05 20:05:30 +0100 |
|---|---|---|
| committer | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-02-05 20:05:30 +0100 |
| commit | eb390226749cf23e50fbae614b88533ea660b2e8 (patch) | |
| tree | ccbd81ec42d03fda5ec4021e9a59ca229263ba33 /doc/update | |
| parent | 0a9cab4ee65f2b42c56989698c401cab60d68b53 (diff) | |
| parent | 8e6ff86d3814f017448eb4b82065f8fa7cb526e1 (diff) | |
| download | gitlab-ce-eb390226749cf23e50fbae614b88533ea660b2e8.tar.gz | |
Merge pull request #8318 from bbodenmiller/patch-9
add editor command to update database.yml; cleanup
Diffstat (limited to 'doc/update')
| -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 |