Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
ce5c08c6
Commit
ce5c08c6
authored
May 02, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'patch-19' into 'master'
Gitlab -> GitLab See merge request !10952
parents
a49d5271
6236705e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
doc/administration/integration/terminal.md
doc/administration/integration/terminal.md
+2
-2
No files found.
doc/administration/integration/terminal.md
View file @
ce5c08c6
...
@@ -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 Git
l
ab using Omnibus, or
through to the next one in the chain. If you installed Git
L
ab 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 Git
l
ab, in which case, you need to:
Omnibus Git
L
ab, 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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment