diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2018-10-11 15:51:34 +0300 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2018-10-11 15:51:34 +0300 |
| commit | 316eaece2f0007523faef5951f44131721bd1f8c (patch) | |
| tree | 90c8bb563509e71a92ffccc659dc4c5a3e38d7a7 /doc | |
| parent | c230b5d16fcbb9e93647642c5aaa6f884cb6bfe9 (diff) | |
| parent | ea7175f8cff889d07144499aaf230c789a67f8c6 (diff) | |
Merge branch 'master' into 'master'
Avoid conflicting anchor name in documentation
See merge request gitlab-org/gitlab-ce!22213
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ci/yaml/README.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index f0738252640..24d60a0cdcc 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -415,7 +415,7 @@ Four keys are now available: `refs`, `kubernetes` and `variables` and `changes`. Refs strategy equals to simplified only/except configuration, whereas kubernetes strategy accepts only `active` keyword. -### `variables` +### `only:variables` `variables` keyword is used to define variables expressions. In other words you can use predefined variables / project / group or @@ -460,7 +460,7 @@ end-to-end: Learn more about variables expressions on [a separate page][variables-expressions]. -### `changes` +### `only:changes` Using `changes` keyword with `only` or `except` makes it possible to define if a job should be created based on files modified by a git push event. |