diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-16 18:09:59 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-16 18:09:59 +0300 |
| commit | 0c87da93750c6428328a3e3cd2ebd0882f6294e3 (patch) | |
| tree | 1b6cb32a86a461e592634249db84f34b44d0c2eb /doc/administration/integration | |
| parent | d87800c3cfa21bde64704542d61a587c5ff4306e (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/integration')
| -rw-r--r-- | doc/administration/integration/plantuml.md | 2 | ||||
| -rw-r--r-- | doc/administration/integration/terminal.md | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/doc/administration/integration/plantuml.md b/doc/administration/integration/plantuml.md index bb72d7070be..9c5e07eedaa 100644 --- a/doc/administration/integration/plantuml.md +++ b/doc/administration/integration/plantuml.md @@ -320,7 +320,7 @@ these steps: - For PlantUML servers running v1.2020.9 and above, such as [plantuml.com](https://plantuml.com), you must set the `PLANTUML_ENCODING` environment variable to enable the `deflate` - compression. In Omnibus GitLab, you can set this value in `/etc/gitlab.rb` with + compression. In Linux package installations, you can set this value in `/etc/gitlab.rb` with this command: ```ruby diff --git a/doc/administration/integration/terminal.md b/doc/administration/integration/terminal.md index bea389a8f0a..e5920520be7 100644 --- a/doc/administration/integration/terminal.md +++ b/doc/administration/integration/terminal.md @@ -87,16 +87,14 @@ it's safe to enable support for these headers globally. If you prefer a narrower set of rules, you can restrict it to URLs ending with `/terminal.ws`. This approach may still result in a few false positives. -If you installed from source, or have made any configuration changes to your -Omnibus installation before upgrading to 8.15, you may need to make some changes -to your configuration. Read +If you self-compiled your installation, you may need to make some changes to your configuration. Read [Upgrading Community Edition and Enterprise Edition from source](../../update/upgrading_from_source.md#nginx-configuration) for more details. To disable web terminal support in GitLab, stop passing the `Connection` and `Upgrade` hop-by-hop headers in the *first* HTTP reverse proxy in the chain. For most users, this is the NGINX server bundled with -Omnibus GitLab, in which case, you need to: +Linux package installations. In this 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 |