summaryrefslogtreecommitdiff
path: root/doc/administration/integration
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2017-02-03 20:54:59 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2017-02-03 20:54:59 +0000
commit1bf03125fa76b7a1423c77c394f5b36140d0b945 (patch)
treec2fe633396ca3302decdaa1e31be62ba931e1480 /doc/administration/integration
parentd76b9291f75031c729760e3e00d9f7f1aa01644d (diff)
parenta6ac23250a41bd6be7f4e530bff22a8e1cfd3104 (diff)
downloadgitlab-ce-1bf03125fa76b7a1423c77c394f5b36140d0b945.tar.gz
Merge branch 'docs/integrations' into 'master'
Refactor integrations page documentation See merge request !8966
Diffstat (limited to 'doc/administration/integration')
-rw-r--r--doc/administration/integration/terminal.md16
1 files changed, 9 insertions, 7 deletions
diff --git a/doc/administration/integration/terminal.md b/doc/administration/integration/terminal.md
index a1d1bb03b50..3fbb13704aa 100644
--- a/doc/administration/integration/terminal.md
+++ b/doc/administration/integration/terminal.md
@@ -1,13 +1,12 @@
# Web terminals
-> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7690)
-in GitLab 8.15. Only project masters and owners can access web terminals.
+> [Introduced][ce-7690] in GitLab 8.15. Only project masters and owners can
+ access web terminals.
-With the introduction of the [Kubernetes](../../project_services/kubernetes.md)
-project service, GitLab gained the ability to store and use credentials for a
-Kubernetes cluster. One of the things it uses these credentials for is providing
-access to [web terminals](../../ci/environments.html#web-terminals)
-for environments.
+With the introduction of the [Kubernetes project service][kubservice], GitLab
+gained the ability to store and use credentials for a Kubernetes cluster. One
+of the things it uses these credentials for is providing access to
+[web terminals](../../ci/environments.html#web-terminals) for environments.
## How it works
@@ -71,3 +70,6 @@ by the above guides.
When these headers are not passed through, Workhorse will return a
`400 Bad Request` response to users attempting to use a web terminal. In turn,
they will receive a `Connection failed` message.
+
+[ce-7690]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7690
+[kubservice]: ../../user/project/integrations/kubernetes.md)