Merge branch 'patch-17' into 'master'

doc/ci/yaml: correct recursive expanded includes documentation

See merge request gitlab-org/gitlab-ce!25918
This commit is contained in:
Evan Read 2019-03-12 01:29:07 +00:00
commit 8f9189557d

View file

@ -1756,7 +1756,7 @@ include:
```
All [nested includes](#nested-includes) will be executed in the scope of the target project,
so it is possible to used local (relative to target project), project, remote
so it is possible to use local (relative to target project), project, remote
or template includes.
#### `include:template`
@ -1802,7 +1802,7 @@ configuration), you have to re-create pipeline.
#### Nested includes
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/53903) in GitLab 11.7.
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/56836) in GitLab 11.9.
Nested includes allow you to compose a set of includes.
A total of 50 includes is allowed.