diff options
| author | Marcia Ramos <marcia@gitlab.com> | 2019-03-01 19:11:29 +0000 |
|---|---|---|
| committer | Marcia Ramos <marcia@gitlab.com> | 2019-03-01 19:11:29 +0000 |
| commit | bc4ee49ecb1e562543cd196e51eac9a61c016de3 (patch) | |
| tree | fecca57fb3788094d1cbfabd66eeeaff929a9662 | |
| parent | a95a923167f568ad4c5ec3f9424038fb797382f1 (diff) | |
| parent | ded2f4ef3c840f46b4264d44051b2baf95747a39 (diff) | |
| download | gitlab-ce-bc4ee49ecb1e562543cd196e51eac9a61c016de3.tar.gz | |
Merge branch 'docs/fix-some-links' into 'master'
Fix some 404 links into charts project
See merge request gitlab-org/gitlab-ce!25589
| -rw-r--r-- | doc/install/kubernetes/preparation/tiller.md | 2 | ||||
| -rw-r--r-- | doc/install/openshift_and_gitlab/index.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/install/kubernetes/preparation/tiller.md b/doc/install/kubernetes/preparation/tiller.md index 00b0737402b..684df14ac2c 100644 --- a/doc/install/kubernetes/preparation/tiller.md +++ b/doc/install/kubernetes/preparation/tiller.md @@ -7,7 +7,7 @@ Helm consists of two parts, the `helm` client and a `tiller` server inside Kuber NOTE: **Note:** If you are not able to run Tiller in your cluster, for example on OpenShift, it -is possible to use [Tiller locally](https://gitlab.com/charts/gitlab/tree/master/doc/helm#local-tiller) +is possible to use [Tiller locally](https://docs.gitlab.com/charts/installation/tools.html#local-tiller) and avoid deploying it into the cluster. This should only be used when Tiller cannot be normally deployed. diff --git a/doc/install/openshift_and_gitlab/index.md b/doc/install/openshift_and_gitlab/index.md index 509020d1975..77bd9e9f7a9 100644 --- a/doc/install/openshift_and_gitlab/index.md +++ b/doc/install/openshift_and_gitlab/index.md @@ -11,7 +11,7 @@ date: 2016-06-28 CAUTION: **Deprecated:** This article is deprecated. Use the official Kubernetes Helm charts for installing GitLab to OpenShift. Check out the -[official installation docs](https://gitlab.com/charts/gitlab/blob/master/doc/cloud/openshift.md) +[official installation docs](https://docs.gitlab.com/charts/installation/cloud/openshift.html) for details. ## Introduction |