diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2019-07-03 13:55:16 +0300 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-07-03 13:55:16 +0300 |
| commit | f7d19f8b624de265761f28af4e3bd86641a86759 (patch) | |
| tree | 8628ddcc50a896af479fffb8b6d9c2495ee64f5e | |
| parent | 9b06890d1d6901b840fb321c9b99264c2e8813f7 (diff) | |
| parent | 8f9288968ec564226a183d9a0b58f3cf35678801 (diff) | |
Merge branch 'docs-patch-72' into 'master'
Gitlab -> GitLab
See merge request gitlab-org/gitlab-ce!30234
| -rw-r--r-- | doc/administration/gitaly/index.md | 2 | ||||
| -rw-r--r-- | doc/user/project/clusters/index.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/administration/gitaly/index.md b/doc/administration/gitaly/index.md index 0bffe2f7472..a3cbc4272f0 100644 --- a/doc/administration/gitaly/index.md +++ b/doc/administration/gitaly/index.md @@ -267,7 +267,7 @@ repository from your GitLab server over HTTP. Gitaly supports TLS encryption. To be able to communicate with a Gitaly instance that listens for secure connections you will need to use `tls://` url -scheme in the `gitaly_address` of the corresponding storage entry in the gitlab configuration. +scheme in the `gitaly_address` of the corresponding storage entry in the GitLab configuration. The admin needs to bring their own certificate as we do not provide that automatically. The certificate to be used needs to be installed on all Gitaly nodes and on all client nodes that communicate with it following procedures described in [GitLab custom certificate configuration](https://docs.gitlab.com/omnibus/settings/ssl.html#install-custom-public-certificates). diff --git a/doc/user/project/clusters/index.md b/doc/user/project/clusters/index.md index c6ee168bad0..d21455fb5ca 100644 --- a/doc/user/project/clusters/index.md +++ b/doc/user/project/clusters/index.md @@ -222,7 +222,7 @@ functionalities needed to successfully build and deploy a containerized application. Bear in mind that the same credentials are used for all the applications running on the cluster. -## Gitlab-managed clusters +## GitLab-managed clusters > [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22011) in GitLab 11.5. > Became [optional](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/26565) in GitLab 11.11. |