diff options
| author | Jason Lenny <jason@gitlab.com> | 2019-08-05 09:20:58 +0000 |
|---|---|---|
| committer | Jason Lenny <jason@gitlab.com> | 2019-08-05 09:20:58 +0000 |
| commit | fa4b086a22bf36c5e6d5e1397454d5be4170fda8 (patch) | |
| tree | c121c56949222862b7467141d76aa404ac7ba575 | |
| parent | 62c100cc245706f7dec4a0794dbb89bd4123cdde (diff) | |
| parent | 9b06333663c441f9147e004a21e8ca7172757464 (diff) | |
| download | gitlab-ce-jlenny-implement-dag-docs-patch-25252.tar.gz | |
Merge branch 'implement-dag-docs' into 'jlenny-implement-dag-docs-patch-25252'jlenny-implement-dag-docs-patch-25252
# Conflicts:
# doc/ci/yaml/README.md
| -rw-r--r-- | doc/ci/yaml/README.md | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index 7be66ced8ac..eeba2973357 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -1707,9 +1707,8 @@ This example creates three paths of execution: as the `linux:build` job finishes, and will not wait for any other jobs in prior stages. -- The Mac one: the `mac:rspec` and `mac:rubocop` jobs will be run as soon - as the `mac:build` job finishes, and will not wait for any other jobs - in prior stages. +- macOS path: the `mac:rspec` and `mac:rubocop` jobs will be run as soon + as the `mac:build` job finishes, without waiting for `linux:build` to finish. - The `production` job will be executed as soon as all previous jobs finish. |