diff options
| author | Sean McGivern <sean@gitlab.com> | 2018-04-24 13:59:00 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2018-04-24 13:59:00 +0100 |
| commit | 6a88ffb412430820e23f19c7c32049abe1a019c3 (patch) | |
| tree | fc99c7049b7dc4be4ac2f24a38a78026476f3da9 /doc/user | |
| parent | db3774376aafbdea8db6840c88bd6d875cb9bac3 (diff) | |
| parent | a544f6ec58ba5f9cfbff6b59b50bc92bc2274bdb (diff) | |
| download | gitlab-ce-6a88ffb412430820e23f19c7c32049abe1a019c3.tar.gz | |
Merge branch 'master' into matbaj/gitlab-ce-add-inherit-command
Diffstat (limited to 'doc/user')
| -rw-r--r-- | doc/user/project/deploy_tokens/index.md | 12 | ||||
| -rw-r--r-- | doc/user/project/pages/getting_started_part_three.md | 2 |
2 files changed, 12 insertions, 2 deletions
diff --git a/doc/user/project/deploy_tokens/index.md b/doc/user/project/deploy_tokens/index.md index 86fc58020e8..7a8b3c75690 100644 --- a/doc/user/project/deploy_tokens/index.md +++ b/doc/user/project/deploy_tokens/index.md @@ -23,7 +23,7 @@ You can create as many deploy tokens as you like from the settings of your proje  -## Revoking a personal access token +## Revoking a deploy token At any time, you can revoke any deploy token by just clicking the respective **Revoke** button under the 'Active deploy tokens' area. @@ -71,6 +71,16 @@ docker login registry.example.com -u <username> -p <deploy_token> Just replace `<username>` and `<deploy_token>` with the proper values. Then you can simply pull images from your Container Registry. +### GitLab Deploy Token + +> [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 +automatically exposed to the CI/CD jobs as environment variables: `CI_DEPLOY_USER` and +`CI_DEPLOY_PASSWORD`, respectively. + [ce-17894]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17894 [ce-11845]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11845 +[ce-18414]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18414 [container registry]: ../container_registry.md diff --git a/doc/user/project/pages/getting_started_part_three.md b/doc/user/project/pages/getting_started_part_three.md index 430fe3af1f8..61af1d2ab27 100644 --- a/doc/user/project/pages/getting_started_part_three.md +++ b/doc/user/project/pages/getting_started_part_three.md @@ -70,7 +70,7 @@ In case you want to point a root domain (`example.com`) to your GitLab Pages site, deployed to `namespace.gitlab.io`, you need to log into your domain's admin control panel and add a DNS `A` record pointing your domain to Pages' server IP address. For projects on -GitLab.com, this IP is `52.167.214.135`. For projects leaving in +GitLab.com, this IP is `52.167.214.135`. For projects living in other GitLab instances (CE or EE), please contact your sysadmin asking for this information (which IP address is Pages server running on your instance). |