diff options
| author | Marcia Ramos <virtua.creative@gmail.com> | 2018-11-20 12:39:16 +0000 |
|---|---|---|
| committer | Marcia Ramos <virtua.creative@gmail.com> | 2018-11-20 12:39:16 +0000 |
| commit | b11cd17ba6c482fd56ff53b2012f939365add4d8 (patch) | |
| tree | 39412d2286558444859886a8eeb2a68cc685aa33 | |
| parent | fa5900fb6b5bda6f8568319293575c3072e47505 (diff) | |
| parent | 4363a73303b2b6631b88e7355faeaf162985972a (diff) | |
| download | gitlab-ce-b11cd17ba6c482fd56ff53b2012f939365add4d8.tar.gz | |
Merge branch 'patch-29' into 'master'
Update 11.2-to-11.3.md
See merge request gitlab-org/gitlab-ce!23141
| -rw-r--r-- | doc/update/11.2-to-11.3.md | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/update/11.2-to-11.3.md b/doc/update/11.2-to-11.3.md index d77f879ee57..f2b8efc3e6e 100644 --- a/doc/update/11.2-to-11.3.md +++ b/doc/update/11.2-to-11.3.md @@ -235,7 +235,7 @@ There might be configuration options available for [`gitlab.yml`][yaml]. View th ```sh cd /home/git/gitlab -git diff origin/11-1-stable:config/gitlab.yml.example origin/11-3-stable:config/gitlab.yml.example +git diff origin/11-2-stable:config/gitlab.yml.example origin/11-3-stable:config/gitlab.yml.example ``` #### Nginx configuration @@ -246,10 +246,10 @@ Ensure you're still up-to-date with the latest NGINX configuration changes: cd /home/git/gitlab # For HTTPS configurations -git diff origin/11-1-stable:lib/support/nginx/gitlab-ssl origin/11-3-stable:lib/support/nginx/gitlab-ssl +git diff origin/11-2-stable:lib/support/nginx/gitlab-ssl origin/11-3-stable:lib/support/nginx/gitlab-ssl # For HTTP configurations -git diff origin/11-1-stable:lib/support/nginx/gitlab origin/11-3-stable:lib/support/nginx/gitlab +git diff origin/11-2-stable:lib/support/nginx/gitlab origin/11-3-stable:lib/support/nginx/gitlab ``` If you are using Strict-Transport-Security in your installation to continue using it you must enable it in your Nginx @@ -283,7 +283,7 @@ There might be new configuration options available for [`gitlab.default.example` ```sh cd /home/git/gitlab -git diff origin/11-1-stable:lib/support/init.d/gitlab.default.example origin/11-3-stable:lib/support/init.d/gitlab.default.example +git diff origin/11-2-stable:lib/support/init.d/gitlab.default.example origin/11-3-stable:lib/support/init.d/gitlab.default.example ``` Ensure you're still up-to-date with the latest init script changes: |