Commit fa9eab02 authored by Evan Read's avatar Evan Read

Merge branch 'master' into 'master'

fix include example

See merge request gitlab-org/gitlab-ce!27571
parents 65e1b8f2 814232ed
...@@ -2061,7 +2061,7 @@ from another project: ...@@ -2061,7 +2061,7 @@ from another project:
```yaml ```yaml
include: include:
- template: Bash.gitlab-ci.yml - template: Bash.gitlab-ci.yml
- project: /group/my-project - project: group/my-project
file: /templates/docker-workflow.yml file: /templates/docker-workflow.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