diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-11-27 14:47:56 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-11-27 14:47:56 +0000 |
| commit | 24fadd7c3d0a8f643e9df1c7ae3c1c7e88e8592e (patch) | |
| tree | 38d11b147066650ad2ddd6c0ffb469394ceb79aa /doc/user | |
| parent | 8ab0fceeef146831336b82c649dfae433b770271 (diff) | |
| parent | 73397a3e6c87065de2e0031c6ecc997b31b9a804 (diff) | |
| download | gitlab-ce-24fadd7c3d0a8f643e9df1c7ae3c1c7e88e8592e.tar.gz | |
Merge branch 'patch-29' into 'master'
Add in the Oxford comma
See merge request gitlab-org/gitlab-ce!15602
Diffstat (limited to 'doc/user')
| -rw-r--r-- | doc/user/project/clusters/index.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/user/project/clusters/index.md b/doc/user/project/clusters/index.md index cf0c7c109a8..e2924c66e70 100644 --- a/doc/user/project/clusters/index.md +++ b/doc/user/project/clusters/index.md @@ -82,7 +82,7 @@ added directly to your configured cluster. Those applications are needed for | Application | GitLab version | Description | | ----------- | :------------: | ----------- | | [Helm Tiller](https://docs.helm.sh/) | 10.2+ | Helm is a package manager for Kubernetes and is required to install all the other applications. It will be automatically installed as a dependency when you try to install a different app. It is installed in its own pod inside the cluster which can run the `helm` CLI in a safe environment. | -| [Ingress](https://kubernetes.io/docs/concepts/services-networking/ingress/) | 10.2+ | Ingress can provide load balancing, SSL termination and name-based virtual hosting. It acts as a web proxy for your applications and is useful if you want to use [Auto DevOps](../../../topics/autodevops/index.md) or deploy your own web apps. | +| [Ingress](https://kubernetes.io/docs/concepts/services-networking/ingress/) | 10.2+ | Ingress can provide load balancing, SSL termination, and name-based virtual hosting. It acts as a web proxy for your applications and is useful if you want to use [Auto DevOps](../../../topics/autodevops/index.md) or deploy your own web apps. | ## Enabling or disabling the Cluster integration |