diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 15:09:11 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 15:09:11 +0000 |
| commit | 0eb3d2f799ce4f4de87fb9fc6fd98e592323bc89 (patch) | |
| tree | fd70d5bc63fe152e0a67aaa5a70e4c9f16dc6ffc /doc/administration/integration | |
| parent | 5564275a0b378298dc6281599cbfe71a937109ff (diff) | |
| download | gitlab-ce-0eb3d2f799ce4f4de87fb9fc6fd98e592323bc89.tar.gz | |
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 | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/administration/integration/plantuml.md b/doc/administration/integration/plantuml.md index 4e34e9923e1..9b8d3ac2efe 100644 --- a/doc/administration/integration/plantuml.md +++ b/doc/administration/integration/plantuml.md @@ -1,6 +1,6 @@ # PlantUML & GitLab -> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/8537) in GitLab 8.16. +> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/8537) in GitLab 8.16. When [PlantUML](http://plantuml.com) integration is enabled and configured in GitLab we are able to create simple diagrams in AsciiDoc and Markdown documents diff --git a/doc/administration/integration/terminal.md b/doc/administration/integration/terminal.md index 42acc4cb80e..aa29e238fc1 100644 --- a/doc/administration/integration/terminal.md +++ b/doc/administration/integration/terminal.md @@ -1,6 +1,6 @@ # Web terminals -> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/7690) +> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/7690) in GitLab 8.15. Only project maintainers and owners can access web terminals. With the introduction of the [Kubernetes integration](../../user/project/clusters/index.md), @@ -92,7 +92,7 @@ they will receive a `Connection failed` message. ## Limiting WebSocket connection time -> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/8413) +> [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 |