Commit b11cd17b authored by Marcia Ramos's avatar Marcia Ramos

Merge branch 'patch-29' into 'master'

Update 11.2-to-11.3.md

See merge request gitlab-org/gitlab-ce!23141
parents fa5900fb 4363a733
...@@ -235,7 +235,7 @@ There might be configuration options available for [`gitlab.yml`][yaml]. View th ...@@ -235,7 +235,7 @@ There might be configuration options available for [`gitlab.yml`][yaml]. View th
```sh ```sh
cd /home/git/gitlab 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 #### Nginx configuration
...@@ -246,10 +246,10 @@ Ensure you're still up-to-date with the latest NGINX configuration changes: ...@@ -246,10 +246,10 @@ Ensure you're still up-to-date with the latest NGINX configuration changes:
cd /home/git/gitlab cd /home/git/gitlab
# For HTTPS configurations # 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 # 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 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` ...@@ -283,7 +283,7 @@ There might be new configuration options available for [`gitlab.default.example`
```sh ```sh
cd /home/git/gitlab 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: Ensure you're still up-to-date with the latest init script changes:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment