summaryrefslogtreecommitdiff
path: root/doc/ci/variables/README.md
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2019-01-31 00:22:03 +0000
committerEvan Read <eread@gitlab.com>2019-01-31 00:22:03 +0000
commit20a284155f56264627624fe3c848976f7f37cebe (patch)
treea1ac4d3831935d0df08090a0648c179af2d64a5c /doc/ci/variables/README.md
parent90ffed5c47ba64af84c82412b764267d41a224e4 (diff)
parent9008d93731a0f058497db07194471744b41235e4 (diff)
downloadgitlab-ce-20a284155f56264627624fe3c848976f7f37cebe.tar.gz
Merge branch 'highlight-environment-args' into 'master'
Highlight when CI_ENVIRONMENT_* environment args are present See merge request gitlab-org/gitlab-ce!24484
Diffstat (limited to 'doc/ci/variables/README.md')
-rw-r--r--doc/ci/variables/README.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/ci/variables/README.md b/doc/ci/variables/README.md
index 45667caf65d..aebb5a2188c 100644
--- a/doc/ci/variables/README.md
+++ b/doc/ci/variables/README.md
@@ -68,9 +68,9 @@ future GitLab releases.**
| **CI_DEPLOY_PASSWORD** | 10.8 | all | Authentication password of the [GitLab Deploy Token][gitlab-deploy-token], only present if the Project has one related.|
| **CI_DEPLOY_USER** | 10.8 | all | Authentication username of the [GitLab Deploy Token][gitlab-deploy-token], only present if the Project has one related.|
| **CI_DISPOSABLE_ENVIRONMENT** | all | 10.1 | Marks that the job is executed in a disposable environment (something that is created only for this job and disposed of/destroyed after the execution - all executors except `shell` and `ssh`). If the environment is disposable, it is set to true, otherwise it is not defined at all. |
-| **CI_ENVIRONMENT_NAME** | 8.15 | all | The name of the environment for this job |
-| **CI_ENVIRONMENT_SLUG** | 8.15 | all | A simplified version of the environment name, suitable for inclusion in DNS, URLs, Kubernetes labels, etc. |
-| **CI_ENVIRONMENT_URL** | 9.3 | all | The URL of the environment for this job |
+| **CI_ENVIRONMENT_NAME** | 8.15 | all | The name of the environment for this job. Only present if [`environment:name`](../yaml/README.md#environmenturl) is set. |
+| **CI_ENVIRONMENT_SLUG** | 8.15 | all | A simplified version of the environment name, suitable for inclusion in DNS, URLs, Kubernetes labels, etc. Only present if [`environment:name`](../yaml/README.md#environmentname) is set. |
+| **CI_ENVIRONMENT_URL** | 9.3 | all | The URL of the environment for this job. Only present if [`environment:url`](../yaml/README.md#environmenturl) is set. |
| **CI_JOB_ID** | 9.0 | all | The unique id of the current job that GitLab CI uses internally |
| **CI_JOB_MANUAL** | 8.12 | all | The flag to indicate that job was manually started |
| **CI_JOB_NAME** | 9.0 | 0.5 | The name of the job as defined in `.gitlab-ci.yml` |