Commit ce5c08c6 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'patch-19' into 'master'

Gitlab -> GitLab

See merge request !10952
parents a49d5271 6236705e
...@@ -32,7 +32,7 @@ In brief: ...@@ -32,7 +32,7 @@ In brief:
As web terminals use WebSockets, every HTTP/HTTPS reverse proxy in front of As web terminals use WebSockets, every HTTP/HTTPS reverse proxy in front of
Workhorse needs to be configured to pass the `Connection` and `Upgrade` headers Workhorse needs to be configured to pass the `Connection` and `Upgrade` headers
through to the next one in the chain. If you installed Gitlab using Omnibus, or through to the next one in the chain. If you installed GitLab using Omnibus, or
from source, starting with GitLab 8.15, this should be done by the default from source, starting with GitLab 8.15, this should be done by the default
configuration, so there's no need for you to do anything. configuration, so there's no need for you to do anything.
...@@ -58,7 +58,7 @@ document for more details. ...@@ -58,7 +58,7 @@ document for more details.
If you'd like to disable web terminal support in GitLab, just stop passing If you'd like to disable web terminal support in GitLab, just stop passing
the `Connection` and `Upgrade` hop-by-hop headers in the *first* HTTP reverse the `Connection` and `Upgrade` hop-by-hop headers in the *first* HTTP reverse
proxy in the chain. For most users, this will be the NGINX server bundled with proxy in the chain. For most users, this will be the NGINX server bundled with
Omnibus Gitlab, in which case, you need to: Omnibus GitLab, in which case, you need to:
* Find the `nginx['proxy_set_headers']` section of your `gitlab.rb` file * Find the `nginx['proxy_set_headers']` section of your `gitlab.rb` file
* Ensure the whole block is uncommented, and then comment out or remove the * Ensure the whole block is uncommented, and then comment out or remove the
......
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