diff options
| author | Arian Sameni <arian.sameni@encifra.net> | 2016-05-30 17:46:54 +0200 |
|---|---|---|
| committer | Arian Sameni <arian.sameni@encifra.net> | 2016-05-30 17:46:54 +0200 |
| commit | b0a2bf08498c5be0f8da9251d5cfff48b801f297 (patch) | |
| tree | 1ea5a6ab0afec27c0ad2e873b516ea27a531c6f8 | |
| parent | 2485bd7bbf9686f993d2a417943feff5c7d5b6f3 (diff) | |
| download | gitlab-ce-b0a2bf08498c5be0f8da9251d5cfff48b801f297.tar.gz | |
Fix 18009: add missing steps in update docs
| -rw-r--r-- | doc/update/8.6-to-8.7.md | 8 | ||||
| -rw-r--r-- | doc/update/8.7-to-8.8.md | 10 |
2 files changed, 17 insertions, 1 deletions
diff --git a/doc/update/8.6-to-8.7.md b/doc/update/8.6-to-8.7.md index 4a2c6ea91d2..bb463d43a7c 100644 --- a/doc/update/8.6-to-8.7.md +++ b/doc/update/8.6-to-8.7.md @@ -86,6 +86,14 @@ sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS ### 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-6-stable:config/gitlab.yml.example origin/8-7-stable:config/gitlab.yml.example +``` + #### Git configuration Disable `git gc --auto` because GitLab runs `git gc` for us already. diff --git a/doc/update/8.7-to-8.8.md b/doc/update/8.7-to-8.8.md index b4d9212289c..32906650f6f 100644 --- a/doc/update/8.7-to-8.8.md +++ b/doc/update/8.7-to-8.8.md @@ -86,6 +86,14 @@ sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS ### 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-7-stable:config/gitlab.yml.example origin/8-8-stable:config/gitlab.yml.example +``` + #### Git configuration Disable `git gc --auto` because GitLab runs `git gc` for us already. @@ -137,7 +145,7 @@ To make sure you didn't miss anything run a more thorough check: If all items are green, then congratulations, the upgrade is complete! -## Things went south? Revert to previous version (8.6) +## Things went south? Revert to previous version (8.7) ### 1. Revert the code to the previous version |