diff options
| author | Evan Read <eread@gitlab.com> | 2019-03-06 05:21:14 +0000 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2019-03-06 05:21:14 +0000 |
| commit | 2fe1b807674b3ac2240b5b0d6375eeeeb464cd89 (patch) | |
| tree | f1a4254bee9b383bce5ccd50c0e966a2fa48bdfc | |
| parent | 8721be863f3b8fb16ea3c6b559132897b7be310d (diff) | |
| parent | be485424e09eba00d2591ee6f69167e73df13990 (diff) | |
| download | gitlab-ce-2fe1b807674b3ac2240b5b0d6375eeeeb464cd89.tar.gz | |
Merge branch 'patch-1' into 'master'
Fixed incorrect include key
See merge request gitlab-org/gitlab-ce!25766
| -rw-r--r-- | doc/ci/yaml/README.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index 4db4b71ecaf..aab26092811 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -1858,7 +1858,7 @@ using a combination of different methods. In this example, `.gitlab-ci.yml` includes local the file `/.gitlab-ci/another-config.yml`: ```yaml -includes: +include: - local: /.gitlab-ci/another-config.yml ``` @@ -1866,7 +1866,7 @@ The `/.gitlab-ci/another-config.yml` includes a template and the `/templates/doc from another project: ```yaml -includes: +include: - template: Bash.gitlab-ci.yml - project: /group/my-project file: /templates/docker-workflow.yml @@ -1876,7 +1876,7 @@ The `/templates/docker-workflow.yml` present in `/group/my-project` includes two of the `/group/my-project`: ```yaml -includes: +include: - local: : /templates/docker-build.yml - local: : /templates/docker-testing.yml ``` |