summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2019-05-15 20:17:51 +0000
committerEvan Read <eread@gitlab.com>2019-05-15 20:17:51 +0000
commit40fc087c177c4e6f213df6f029665b010cd4f4d0 (patch)
tree17e4a34c0863c7d117e9cc1da64ba49753b26b3e /doc
parentb924d6662fe3528c8dcee083e455336cff73be99 (diff)
parent8a991e8a87630792ac64428b46a705f07abf7a39 (diff)
downloadgitlab-ce-40fc087c177c4e6f213df6f029665b010cd4f4d0.tar.gz
Merge branch 'patch-34' into 'master'
recursive/nested includes supported now See merge request gitlab-org/gitlab-ce!28155
Diffstat (limited to 'doc')
-rw-r--r--doc/ci/yaml/README.md3
1 files changed, 0 insertions, 3 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index 20f0a113563..85f1a51b0ce 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -1764,9 +1764,6 @@ TIP: **Tip:**
Use merging to customize and override included CI/CD configurations with local
definitions.
-Recursive includes are not supported. Your external files should not use the
-`include` keyword as it will be ignored.
-
NOTE: **Note:**
Using YAML aliases across different YAML files sourced by `include` is not
supported. You must only refer to aliases in the same file. Instead