diff options
| author | Ash McKenzie <amckenzie@gitlab.com> | 2019-09-02 01:00:29 +0000 |
|---|---|---|
| committer | Ash McKenzie <amckenzie@gitlab.com> | 2019-09-02 01:00:29 +0000 |
| commit | 6e744f7071f435b453223445e0097bf114c4aaa0 (patch) | |
| tree | 083baf94524744200a1a36d271a0eb5971d33d53 /doc | |
| parent | eaae9cec212c2ff60c4fbe7074f16039166b379c (diff) | |
| parent | bf50573710ca008081063338664ec8b47a87d059 (diff) | |
| download | gitlab-ce-6e744f7071f435b453223445e0097bf114c4aaa0.tar.gz | |
Merge branch 'sh-fix-ci-lint-500-error' into 'master'
Fix 500 error in CI lint when included templates are an array
Closes #66605
See merge request gitlab-org/gitlab-ce!32232
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ci/yaml/README.md | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index 38276de6791..10255f768e6 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -2171,6 +2171,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. |