Commit 3b1daa55 authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab-ce master

parents ae5fc03a bc4ee49e
...@@ -38,6 +38,7 @@ Have a look at some of our most popular documentation resources: ...@@ -38,6 +38,7 @@ Have a look at some of our most popular documentation resources:
| [GitLab CI/CD examples](ci/examples/README.md) | Get up to speed quickly with common CI/CD scenarios. | | [GitLab CI/CD examples](ci/examples/README.md) | Get up to speed quickly with common CI/CD scenarios. |
| [GitLab Container Registry](user/project/container_registry.md) | Host containers within GitLab. | | [GitLab Container Registry](user/project/container_registry.md) | Host containers within GitLab. |
| [GitLab Pages](user/project/pages/index.md) | Host static websites for your projects with GitLab. | | [GitLab Pages](user/project/pages/index.md) | Host static websites for your projects with GitLab. |
| [GitLab.com settings](user/gitlab_com/index.md) | Settings for [GitLab.com](#gitlabcom). |
| [Kubernetes integration](user/project/clusters/index.md) | Use GitLab with Kubernetes. | | [Kubernetes integration](user/project/clusters/index.md) | Use GitLab with Kubernetes. |
| [SSH authentication](ssh/README.md) | Secure your network communications. | | [SSH authentication](ssh/README.md) | Secure your network communications. |
| [Using Docker images](ci/docker/using_docker_images.md) | Build and test your applications with Docker. | | [Using Docker images](ci/docker/using_docker_images.md) | Build and test your applications with Docker. |
......
...@@ -236,6 +236,24 @@ For other punctuation rules, please refer to the ...@@ -236,6 +236,24 @@ For other punctuation rules, please refer to the
E.g., instead of writing something like `Read more about GitLab Issue Boards [here](LINK)`, E.g., instead of writing something like `Read more about GitLab Issue Boards [here](LINK)`,
write `Read more about [GitLab Issue Boards](LINK)`. write `Read more about [GitLab Issue Boards](LINK)`.
### Links to confidential issues
Don't link directly to [confidential issues](../../user/project/issues/confidential_issues.md). These will fail for:
- Those without sufficient permissions.
- Automated link checkers.
Instead:
- Mention in the text that the information is contained in a confidential issue. This will reduce confusion.
- Provide a link in back ticks (`` ` ``) so that those with access to the issue can easily navigate to it.
Example:
```md
For more information, see the [confidential issue](https://docs.gitlab.com/ee/user/project/issues/confidential_issues.html) `https://gitlab.com/gitlab-org/gitlab-ce/issues/<issue_number>`.
```
### Unlinking emails ### Unlinking emails
By default, all email addresses will render in an email tag on docs.gitlab.com. By default, all email addresses will render in an email tag on docs.gitlab.com.
......
...@@ -32,8 +32,7 @@ clicking `Pause sync` on the [Crowdin integration settings ...@@ -32,8 +32,7 @@ clicking `Pause sync` on the [Crowdin integration settings
page](https://translate.gitlab.com/project/gitlab-ee/settings#integration). page](https://translate.gitlab.com/project/gitlab-ee/settings#integration).
When all failures are resolved, the translations need to be double When all failures are resolved, the translations need to be double
checked once more [as discussed in this checked once more as discussed in [confidential issue](https://docs.gitlab.com/ee/user/project/issues/confidential_issues.html) `https://gitlab.com/gitlab-org/gitlab-ce/issues/37850`.
issue](https://gitlab.com/gitlab-org/gitlab-ce/issues/37850).
## Merging translations ## Merging translations
......
...@@ -7,7 +7,7 @@ Helm consists of two parts, the `helm` client and a `tiller` server inside Kuber ...@@ -7,7 +7,7 @@ Helm consists of two parts, the `helm` client and a `tiller` server inside Kuber
NOTE: **Note:** NOTE: **Note:**
If you are not able to run Tiller in your cluster, for example on OpenShift, it 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 and avoid deploying it into the cluster. This should only be used when Tiller
cannot be normally deployed. cannot be normally deployed.
......
...@@ -11,7 +11,7 @@ date: 2016-06-28 ...@@ -11,7 +11,7 @@ date: 2016-06-28
CAUTION: **Deprecated:** CAUTION: **Deprecated:**
This article is deprecated. Use the official Kubernetes Helm charts for This article is deprecated. Use the official Kubernetes Helm charts for
installing GitLab to OpenShift. Check out the 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. for details.
## Introduction ## Introduction
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment