Commit fadfbe18 authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab-ce master

parents 9c948cd7 2fe1b807
......@@ -1902,7 +1902,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
```
......@@ -1910,7 +1910,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
......@@ -1920,7 +1920,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
```
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment