Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLyle Kozloff <lkozloff@gitlab.com>2018-12-13 02:35:50 +0300
committerLyle Kozloff <lkozloff@gitlab.com>2018-12-13 02:35:50 +0300
commitd3f7c2332d29f10e217c44df295deb8c5fbfc6d2 (patch)
treef955c6c845a55ce5d9a8e0223f124babd55debf4
parent0c798c670012a4e0e075aca988ee494ae995a387 (diff)
Rephrasing to remove HTML requirementpatch-31
-rw-r--r--doc/ci/variables/where_variables_can_be_used.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/ci/variables/where_variables_can_be_used.md b/doc/ci/variables/where_variables_can_be_used.md
index b57ae5355da..1757bd56dc6 100644
--- a/doc/ci/variables/where_variables_can_be_used.md
+++ b/doc/ci/variables/where_variables_can_be_used.md
@@ -17,8 +17,8 @@ There are two places defined variables can be used. On the:
| Definition | Can be expanded? | Expansion place | Description |
|--------------------------------------|-------------------|-----------------|--------------|
-| `environment:url` | yes | GitLab | The variable expansion is made by GitLab's [internal variable expansion mechanism](#gitlab-internal-variable-expansion-mechanism).<br/>- Supported: all variables defined for a job (project/group variables, variables from `.gitlab-ci.yml`, variables from triggers, variables from pipeline schedules)<br/>- Not supported: variables defined in Runner's `config.toml` and variables created in job's `script` |
-| `environment:name` | yes | GitLab | Similar to `environment:url`, but the variables expansion doesn't support: <br/>- variables that are based on the environment's name (`CI_ENVIRONMENT_NAME`, `CI_ENVIRONMENT_SLUG`)<br/>- any other variables related to environment (currently only `CI_ENVIRONMENT_URL`)<br/>- [persisted variables](#persisted-variables) |
+| `environment:url` | yes | GitLab | The variable expansion is made by GitLab's [internal variable expansion mechanism](#gitlab-internal-variable-expansion-mechanism).<br/>- Supported variables include: all variables defined for a job (project/group variables, variables from `.gitlab-ci.yml`, variables from triggers, variables from pipeline schedules). Unsupported variables are those variables defined in Runner's `config.toml` and variables created in job's `script` |
+| `environment:name` | yes | GitLab | Similar to `environment:url`, but the variables expansion doesn't support variables that are based on the environment's name (`CI_ENVIRONMENT_NAME`, `CI_ENVIRONMENT_SLUG`), any other variables related to environment (currently only `CI_ENVIRONMENT_URL`) or [persisted variables](#persisted-variables) |
| `variables` | yes | Runner | The variable expansion is made by GitLab Runner's [internal variable expansion mechanism](#gitlab-runner-internal-variable-expansion-mechanism) |
| `image` | yes | Runner | The variable expansion is made by GitLab Runner's [internal variable expansion mechanism](#gitlab-runner-internal-variable-expansion-mechanism) |
| `services:[]` | yes | Runner | The variable expansion is made by GitLab Runner's [internal variable expansion mechanism](#gitlab-runner-internal-variable-expansion-mechanism) |
@@ -26,7 +26,7 @@ There are two places defined variables can be used. On the:
| `cache:key` | yes | Runner | The variable expansion is made by GitLab Runner's [internal variable expansion mechanism](#gitlab-runner-internal-variable-expansion-mechanism) |
| `artifacts:name` | yes | Runner | The variable expansion is made by GitLab Runner's shell environment |
| `script`, `before_script`, `after_script` | yes | Script execution shell | The variable expansion is made by the [execution shell environment](#execution-shell-environment) |
-| `only:variables:[]`, `except:variables:[]` | no | n/a | The variable must be in the form of `$variable`.<br/>Not supported:<br/>- variables that are based on the environment's name (`CI_ENVIRONMENT_NAME`, `CI_ENVIRONMENT_SLUG`)<br/>- any other variables related to environment (currently only `CI_ENVIRONMENT_URL`)<br/>- [persisted variables](#persisted-variables) |
+| `only:variables:[]`, `except:variables:[]` | no | n/a | The variable must be in the form of `$variable`, unsupported or thoes that are based on the environment's name (`CI_ENVIRONMENT_NAME`, `CI_ENVIRONMENT_SLUG`), any other variables related to environment (currently only `CI_ENVIRONMENT_URL`) and [persisted variables](#persisted-variables) |
### `config.toml` file