summaryrefslogtreecommitdiff
path: root/doc/ci
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-08 03:09:31 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-08 03:09:31 +0000
commite2ee1eec50aa8df8543d7ecc585ec0ba5ee544ac (patch)
tree7998650d27ada12ee7d06a21cbb3b5e89f298378 /doc/ci
parent060c842402c00f830a810702600cbe39dfa6cf62 (diff)
downloadgitlab-ce-e2ee1eec50aa8df8543d7ecc585ec0ba5ee544ac.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci')
-rw-r--r--doc/ci/docker/using_docker_images.md2
-rw-r--r--doc/ci/variables/README.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/ci/docker/using_docker_images.md b/doc/ci/docker/using_docker_images.md
index b371a74bd71..90e5c77063e 100644
--- a/doc/ci/docker/using_docker_images.md
+++ b/doc/ci/docker/using_docker_images.md
@@ -532,7 +532,7 @@ runtime.
There are two approaches that you can take in order to access a
private registry. Both require setting the environment variable
-`DOCKER_AUTH_CONFIG` with appropriate authentication info.
+`DOCKER_AUTH_CONFIG` with appropriate authentication information.
1. Per-job: To configure one job to access a private registry, add
`DOCKER_AUTH_CONFIG` as a job variable.
diff --git a/doc/ci/variables/README.md b/doc/ci/variables/README.md
index 81b9cd8bece..afa2e247679 100644
--- a/doc/ci/variables/README.md
+++ b/doc/ci/variables/README.md
@@ -453,7 +453,7 @@ pass CI variables to the running application by prefixing the key of the
variable with `K8S_SECRET_`.
These [prefixed
-variables](../../topics/autodevops/index.md#application-secret-variables) will
+variables](../../topics/autodevops/customize.md#application-secret-variables) will
then be available as environment variables on the running application
container.