summaryrefslogtreecommitdiff
path: root/doc/user
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2018-05-21 12:27:18 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2018-05-21 12:27:18 +0000
commitde3f89a4b6f7f4149e4bca681d68f73edeba6177 (patch)
treefc1ae4123d3435acf0e6e7acf987838331c7b83d /doc/user
parentd5159b9c58389ce75ce5ee24e3cab14fb86ff5a4 (diff)
parentdbe0839396f56e30780350e840a1ded303dfbb81 (diff)
downloadgitlab-ce-de3f89a4b6f7f4149e4bca681d68f73edeba6177.tar.gz
Merge branch '46454-wrong-value-in-ci-deploy-user' into 'master'
Resolve "CI/CD jobs: Wrong value in env. variable CI_DEPLOY_USER using <gitlab-deploy-token> deploy token" Closes #46454 See merge request gitlab-org/gitlab-ce!19047
Diffstat (limited to 'doc/user')
-rw-r--r--doc/user/project/deploy_tokens/index.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/user/project/deploy_tokens/index.md b/doc/user/project/deploy_tokens/index.md
index 7a8b3c75690..c09d5aeba8e 100644
--- a/doc/user/project/deploy_tokens/index.md
+++ b/doc/user/project/deploy_tokens/index.md
@@ -76,7 +76,7 @@ pull images from your Container Registry.
> [Introduced][ce-18414] in GitLab 10.8.
There's a special case when it comes to Deploy Tokens, if a user creates one
-named `gitlab-deploy-token`, the name and token of the Deploy Token will be
+named `gitlab-deploy-token`, the username and token of the Deploy Token will be
automatically exposed to the CI/CD jobs as environment variables: `CI_DEPLOY_USER` and
`CI_DEPLOY_PASSWORD`, respectively.