diff options
| author | Evan Read <eread@gitlab.com> | 2019-07-16 03:46:14 +0000 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2019-07-16 03:46:14 +0000 |
| commit | 90341cbfe2f13abd2d6d272e1966a119a1531ffc (patch) | |
| tree | 05ea73d35a3972dc9d88914733edf49864e96da9 /doc/ci | |
| parent | be062695f247db2be415f24a3bf9d5f41defe747 (diff) | |
| parent | 35ec3e5797bfcecfdb47147c9e03dae3181e2ee1 (diff) | |
| download | gitlab-ce-90341cbfe2f13abd2d6d272e1966a119a1531ffc.tar.gz | |
Merge branch 'docs/12733-docs-using-multiple-extends-in-gitlab-ci-yml-introduced-in-gitlab-12' into 'master'
Specify what version of multiple extends in docs
Closes gitlab-ee#12733
See merge request gitlab-org/gitlab-ce!30667
Diffstat (limited to 'doc/ci')
| -rw-r--r-- | doc/ci/yaml/README.md | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index c2ef58acf15..851fbe23c3c 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -974,7 +974,7 @@ review_app: stop_review_app: stage: deploy variables: - GIT_STRATEGY: none + GIT_STRATEGY: none script: make delete-app when: manual environment: @@ -2221,10 +2221,10 @@ spinach: script: rake spinach ``` -It's also possible to use multiple parents for `extends`. -The algorithm used for merge is "closest scope wins", so keys -from the last member will always shadow anything defined on other levels. -For example: +In GitLab 12.0 and later, it's also possible to use multiple parents for +`extends`. The algorithm used for merge is "closest scope wins", so +keys from the last member will always shadow anything defined on other +levels. For example: ```yaml .only-important: @@ -2644,7 +2644,7 @@ variables: The value of `GIT_CLONE_PATH` is expanded once into `$CI_BUILDS_DIR/go/src/namespace/project`, and results in failure -because `$CI_BUILDS_DIR` is not expanded. +because `$CI_BUILDS_DIR` is not expanded. ## Special YAML features |