diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-05-02 12:47:33 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-05-02 12:47:33 +0000 |
| commit | ce5c08c66507733756dd9906aec2f3dd302f2a8d (patch) | |
| tree | a53bf4ba0a4b767c60206d72d5398b161fec329e | |
| parent | a49d5271fb70e51fbe25dddbc2877b6e332aed0d (diff) | |
| parent | 6236705ef6413fdc58a1d5514fc34d1f481d654f (diff) | |
| download | gitlab-ce-ce5c08c66507733756dd9906aec2f3dd302f2a8d.tar.gz | |
Merge branch 'patch-19' into 'master'
Gitlab -> GitLab
See merge request !10952
| -rw-r--r-- | doc/administration/integration/terminal.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/administration/integration/terminal.md b/doc/administration/integration/terminal.md index 3b5ee86b68b..91e844c7b42 100644 --- a/doc/administration/integration/terminal.md +++ b/doc/administration/integration/terminal.md @@ -32,7 +32,7 @@ In brief: 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 -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 configuration, so there's no need for you to do anything. @@ -58,7 +58,7 @@ document for more details. 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 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 * Ensure the whole block is uncommented, and then comment out or remove the |