summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-08-26 12:12:52 -0700
committerStan Hu <stanhu@gmail.com>2019-08-31 04:38:12 -0700
commitbf50573710ca008081063338664ec8b47a87d059 (patch)
tree298bf928cf9628f61aae517bfbc85b1558f105d8 /doc
parentf7e3693435307b56e4da8d8584c6af01459e4813 (diff)
downloadgitlab-ce-bf50573710ca008081063338664ec8b47a87d059.tar.gz
Fix 500 error in CI lint when included templates are an arraysh-fix-ci-lint-500-error
Previously the following syntax would fail in the linter with an error 500: ``` include: template: - License-Management.gitlab-ci.yml - Dependency-Scanning.gitlab-ci.yml - SAST.gitlab-ci.yml ``` Now the error will call out specifically that the value is not a string. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66605
Diffstat (limited to 'doc')
-rw-r--r--doc/ci/yaml/README.md8
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index 7a60dedc206..0a1dcf2737b 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -2170,6 +2170,14 @@ include:
- template: Auto-DevOps.gitlab-ci.yml
```
+Multiple `include:template` files:
+
+```yaml
+include:
+ - template: Android-Fastlane.gitlab-ci.yml
+ - template: Auto-DevOps.gitlab-ci.yml
+```
+
All [nested includes](#nested-includes) will be executed only with the permission of the user,
so it is possible to use project, remote or template includes.