Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
2fe1b807
Commit
2fe1b807
authored
Mar 06, 2019
by
Evan Read
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'patch-1' into 'master'
Fixed incorrect include key See merge request gitlab-org/gitlab-ce!25766
parents
8721be86
be485424
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
doc/ci/yaml/README.md
doc/ci/yaml/README.md
+3
-3
No files found.
doc/ci/yaml/README.md
View file @
2fe1b807
...
@@ -1858,7 +1858,7 @@ using a combination of different methods.
...
@@ -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`
:
In this example,
`.gitlab-ci.yml`
includes local the file
`/.gitlab-ci/another-config.yml`
:
```
yaml
```
yaml
include
s
:
include
:
-
local
:
/.gitlab-ci/another-config.yml
-
local
:
/.gitlab-ci/another-config.yml
```
```
...
@@ -1866,7 +1866,7 @@ The `/.gitlab-ci/another-config.yml` includes a template and the `/templates/doc
...
@@ -1866,7 +1866,7 @@ The `/.gitlab-ci/another-config.yml` includes a template and the `/templates/doc
from another project:
from another project:
```
yaml
```
yaml
include
s
:
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
...
@@ -1876,7 +1876,7 @@ The `/templates/docker-workflow.yml` present in `/group/my-project` includes two
...
@@ -1876,7 +1876,7 @@ The `/templates/docker-workflow.yml` present in `/group/my-project` includes two
of the
`/group/my-project`
:
of the
`/group/my-project`
:
```
yaml
```
yaml
include
s
:
include
:
-
local
:
:
/templates/docker-build.yml
-
local
:
:
/templates/docker-build.yml
-
local
:
:
/templates/docker-testing.yml
-
local
:
:
/templates/docker-testing.yml
```
```
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment