diff options
author | Rémy Coutable <remy@rymai.me> | 2016-02-12 09:35:52 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-02-12 09:35:52 +0000 |
commit | b136f2640831464e0740c0840f7317ab4464b490 (patch) | |
tree | 69ac8498603c43c62937c61e6d757b23bd8799b9 | |
parent | 9022070fac7555b9b6bb26e3510b5f9641414ff8 (diff) | |
parent | 41d24868e9efc0f4a7d2888683e0224ad9e144b9 (diff) | |
download | gitlab-ce-b136f2640831464e0740c0840f7317ab4464b490.tar.gz |
Merge branch 're-add-update-configuration-files-in-latest-upgrade-guide' into 'master'
Re-add "Update configuration files" section in the 8.4 to 8.5 upgrade guide
Needed because of !2782.
See merge request !2796
-rw-r--r-- | doc/update/8.4-to-8.5.md | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/doc/update/8.4-to-8.5.md b/doc/update/8.4-to-8.5.md index 6e035047b24..a2b43356b59 100644 --- a/doc/update/8.4-to-8.5.md +++ b/doc/update/8.4-to-8.5.md @@ -72,12 +72,22 @@ sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS ``` -### 7. Start application +### 7. Update configuration files + +#### New configuration options for `gitlab.yml` + +There are new configuration options available for [`gitlab.yml`](config/gitlab.yml.example). View them with the command below and apply them manually to your current `gitlab.yml`: + +```sh +git diff origin/8-4-stable:config/gitlab.yml.example origin/8-5-stable:config/gitlab.yml.example +``` + +### 8. Start application sudo service gitlab start sudo service nginx restart -### 8. Check application status +### 9. Check application status Check if GitLab and its environment are configured correctly: |