diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2016-12-08 11:07:45 +1100 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-12-08 11:07:45 +1100 |
| commit | e41c3f698d82be51076bf83a3e7d4d90d9fc7efb (patch) | |
| tree | 0b112f77f3f8e2c50f3e428cbce76c6f716b6c23 | |
| parent | e7b045eadaf315dc2ae4fc079af5d1199d3e5d25 (diff) | |
| download | gitlab-ce-e41c3f698d82be51076bf83a3e7d4d90d9fc7efb.tar.gz | |
Correct previous stable branch used in 8.14 to 8.15 update guiders-8-15-update-guide
[ci skip]
| -rw-r--r-- | doc/update/8.14-to-8.15.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/update/8.14-to-8.15.md b/doc/update/8.14-to-8.15.md index 576b943b98c..3f58493fa63 100644 --- a/doc/update/8.14-to-8.15.md +++ b/doc/update/8.14-to-8.15.md @@ -113,7 +113,7 @@ sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS 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-13-stable:config/gitlab.yml.example origin/8-15-stable:config/gitlab.yml.example +git diff origin/8-14-stable:config/gitlab.yml.example origin/8-15-stable:config/gitlab.yml.example ``` #### Git configuration @@ -131,10 +131,10 @@ Ensure you're still up-to-date with the latest NGINX configuration changes: ```sh # For HTTPS configurations -git diff origin/8-13-stable:lib/support/nginx/gitlab-ssl origin/8-15-stable:lib/support/nginx/gitlab-ssl +git diff origin/8-14-stable:lib/support/nginx/gitlab-ssl origin/8-15-stable:lib/support/nginx/gitlab-ssl # For HTTP configurations -git diff origin/8-13-stable:lib/support/nginx/gitlab origin/8-15-stable:lib/support/nginx/gitlab +git diff origin/8-14-stable:lib/support/nginx/gitlab origin/8-15-stable:lib/support/nginx/gitlab ``` If you are using Apache instead of NGINX please see the updated [Apache templates]. |