Commit 5bbf63ed authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab-ce master

parents 4f0b3fe9 fa9eab02
...@@ -2069,7 +2069,7 @@ from another project: ...@@ -2069,7 +2069,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