summaryrefslogtreecommitdiff
path: root/doc/ci
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-13 15:07:29 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-13 15:07:29 +0000
commit3318518149062e5d17105f2170bd7bd9647af415 (patch)
treea2e49b8fea4543717ca006e9d06bdc032d5d4281 /doc/ci
parent4e516dbff9767a35677fdc4a6e39005b4b564376 (diff)
downloadgitlab-ce-3318518149062e5d17105f2170bd7bd9647af415.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci')
-rw-r--r--doc/ci/yaml/README.md2
1 files changed, 0 insertions, 2 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index 37e86a2f5a3..ea67617ff5c 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -2023,8 +2023,6 @@ Defining an empty array will skip downloading any artifacts for that job.
The status of the previous job is not considered when using `dependencies`, so
if it failed or it is a manual job that was not run, no error occurs.
----
-
In the following example, we define two jobs with artifacts, `build:osx` and
`build:linux`. When the `test:osx` is executed, the artifacts from `build:osx`
will be downloaded and extracted in the context of the build. The same happens