summaryrefslogtreecommitdiff
path: root/doc/administration/integration
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-24 03:09:28 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-24 03:09:28 +0000
commitbe2f4c5788975597dd7be1c8a3525549770c1216 (patch)
tree083ed0d7e29e26d479c00e00d9cb89d74ebbb0ef /doc/administration/integration
parent2711c26beaca6c3a5a3be4b65e01557faf0185b6 (diff)
downloadgitlab-ce-be2f4c5788975597dd7be1c8a3525549770c1216.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/integration')
-rw-r--r--doc/administration/integration/terminal.md9
1 files changed, 5 insertions, 4 deletions
diff --git a/doc/administration/integration/terminal.md b/doc/administration/integration/terminal.md
index aa29e238fc1..0aa42e630b9 100644
--- a/doc/administration/integration/terminal.md
+++ b/doc/administration/integration/terminal.md
@@ -1,7 +1,9 @@
# Web terminals
-> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/7690)
-in GitLab 8.15. Only project maintainers and owners can access web terminals.
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/7690) in GitLab 8.15.
+
+NOTE: **Note:**
+Only project maintainers and owners can access web terminals.
With the introduction of the [Kubernetes integration](../../user/project/clusters/index.md),
GitLab gained the ability to store and use credentials for a Kubernetes cluster.
@@ -92,8 +94,7 @@ they will receive a `Connection failed` message.
## Limiting WebSocket connection time
-> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/8413)
-in GitLab 8.17.
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/8413) in GitLab 8.17.
Terminal sessions use long-lived connections; by default, these may last
forever. You can configure a maximum session time in the Admin Area of your