diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2019-02-08 14:24:31 +0100 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-02-11 15:29:21 +0100 |
| commit | 4d101979150e16c0cc8ac5e0380e9ef407542741 (patch) | |
| tree | cd5c8959cc42d687631095b7cbf27934dea9d1df /doc/administration/integration | |
| parent | ef875bd7aa24fd2c68027b8d6c837f33642a606e (diff) | |
| download | gitlab-ce-4d101979150e16c0cc8ac5e0380e9ef407542741.tar.gz | |
Refactor the upgrading from source docsdocs/refactor-update-guides
Instead of requiring one separate document for every version (which is
created by release managers), we now use a single document for both
Community Edition and Enterprise Edition. This allows developers to add
guidelines right away, instead of release managers having to determine
what to add.
Version specific upgrading instructions are placed in a separate
section. This prevents instructions from lingering around for many
versions should a developer forget to remove them. This also ensures
that all instructions are kept in a single place, instead of being
spread across different documents.
A minor downside is that CE and EE guidelines now live in the same
document, which could cause merge conflicts. Since we are working
towards a single codebase, this should only be an issue until we merge
the codebases together; something we expect to do in the coming months.
This commit also removes all old upgrading instructions, but these can
still be accessed using Git branch specific URLs (included in the
updating README).
Diffstat (limited to 'doc/administration/integration')
| -rw-r--r-- | doc/administration/integration/terminal.md | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/administration/integration/terminal.md b/doc/administration/integration/terminal.md index 40e03093743..25d85d1687b 100644 --- a/doc/administration/integration/terminal.md +++ b/doc/administration/integration/terminal.md @@ -64,8 +64,9 @@ narrower set of rules, you can restrict it to URLs ending with `/terminal.ws` (although this may still have 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. See the [8.14 to 8.15 upgrade](../../update/8.14-to-8.15.md#nginx-configuration) +Omnibus installation before upgrading to 8.15, you may need to make some changes +to your configuration. See the [Upgrading Community Edition and Enterprise +Edition from source](../../update/upgrading_from_source.md#nginx-configuration) document for more details. If you'd like to disable web terminal support in GitLab, just stop passing |