diff options
| author | Marcia Ramos <virtua.creative@gmail.com> | 2018-11-20 12:44:32 +0000 |
|---|---|---|
| committer | Marcia Ramos <virtua.creative@gmail.com> | 2018-11-20 12:44:32 +0000 |
| commit | 22ddd1f84f7fe788c03adaa76fa013bb5a249219 (patch) | |
| tree | f3144a59630ada2d6ebf46038e5c259b0b482a9d | |
| parent | b11cd17ba6c482fd56ff53b2012f939365add4d8 (diff) | |
| parent | f826f9072267b7e50d5c2c32da42f22def1b9ccf (diff) | |
| download | gitlab-ce-22ddd1f84f7fe788c03adaa76fa013bb5a249219.tar.gz | |
Merge branch 'patch-30' into 'master'
Update 11.3-to-11.4.md
See merge request gitlab-org/gitlab-ce!23142
| -rw-r--r-- | doc/update/11.3-to-11.4.md | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/update/11.3-to-11.4.md b/doc/update/11.3-to-11.4.md index 00dfb19b4b4..fddec45e57a 100644 --- a/doc/update/11.3-to-11.4.md +++ b/doc/update/11.3-to-11.4.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-4-stable:config/gitlab.yml.example +git diff origin/11-3-stable:config/gitlab.yml.example origin/11-4-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-4-stable:lib/support/nginx/gitlab-ssl +git diff origin/11-3-stable:lib/support/nginx/gitlab-ssl origin/11-4-stable:lib/support/nginx/gitlab-ssl # For HTTP configurations -git diff origin/11-1-stable:lib/support/nginx/gitlab origin/11-4-stable:lib/support/nginx/gitlab +git diff origin/11-3-stable:lib/support/nginx/gitlab origin/11-4-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-4-stable:lib/support/init.d/gitlab.default.example +git diff origin/11-3-stable:lib/support/init.d/gitlab.default.example origin/11-4-stable:lib/support/init.d/gitlab.default.example ``` Ensure you're still up-to-date with the latest init script changes: |