Commit 316eaece authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Merge branch 'master' into 'master'

Avoid conflicting anchor name in documentation

See merge request gitlab-org/gitlab-ce!22213
parents c230b5d1 ea7175f8
...@@ -415,7 +415,7 @@ Four keys are now available: `refs`, `kubernetes` and `variables` and `changes`. ...@@ -415,7 +415,7 @@ Four keys are now available: `refs`, `kubernetes` and `variables` and `changes`.
Refs strategy equals to simplified only/except configuration, whereas Refs strategy equals to simplified only/except configuration, whereas
kubernetes strategy accepts only `active` keyword. kubernetes strategy accepts only `active` keyword.
### `variables` ### `only:variables`
`variables` keyword is used to define variables expressions. In other words `variables` keyword is used to define variables expressions. In other words
you can use predefined variables / project / group or you can use predefined variables / project / group or
...@@ -460,7 +460,7 @@ end-to-end: ...@@ -460,7 +460,7 @@ end-to-end:
Learn more about variables expressions on [a separate page][variables-expressions]. 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 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. a job should be created based on files modified by a git push event.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment