Commit dc859813 authored by Evan Read's avatar Evan Read

Merge branch 'zm-rephrase-ci-docs' into 'master'

Update grammar in DAG docs

See merge request gitlab-org/gitlab-ce!32021
parents fa1ee60f ca334da9
...@@ -65,7 +65,7 @@ as quickly as possible. ...@@ -65,7 +65,7 @@ as quickly as possible.
Relationships are defined between jobs using the [`needs:` keyword](../yaml/README.md#needs). Relationships are defined between jobs using the [`needs:` keyword](../yaml/README.md#needs).
Note that `needs:` also works with the [parallel](../yaml/README.md#parallel) keyword, Note that `needs:` also works with the [parallel](../yaml/README.md#parallel) keyword,
giving your powerful options for parallelization within your pipeline. giving you powerful options for parallelization within your pipeline.
## Limitations ## Limitations
......
...@@ -1734,8 +1734,8 @@ This example creates three paths of execution: ...@@ -1734,8 +1734,8 @@ This example creates three paths of execution:
in the first stage (see [gitlab-ce#65504](https://gitlab.com/gitlab-org/gitlab-ce/issues/65504)). in the first stage (see [gitlab-ce#65504](https://gitlab.com/gitlab-org/gitlab-ce/issues/65504)).
1. If `needs:` refers to a job that is marked as `parallel:`. 1. If `needs:` refers to a job that is marked as `parallel:`.
the current job will depend on all parallel jobs created. the current job will depend on all parallel jobs created.
1. `needs:` is similar to `dependencies:` in that needs to use jobs from 1. `needs:` is similar to `dependencies:` in that it needs to use jobs from
prior stages, this means that it is impossible to create circular prior stages, meaning it is impossible to create circular
dependencies or depend on jobs in the current stage (see [gitlab-ce#65505](https://gitlab.com/gitlab-org/gitlab-ce/issues/65505)). dependencies or depend on jobs in the current stage (see [gitlab-ce#65505](https://gitlab.com/gitlab-org/gitlab-ce/issues/65505)).
1. Related to the above, stages must be explicitly defined for all jobs 1. Related to the above, stages must be explicitly defined for all jobs
that have the keyword `needs:` or are referred to by one. that have the keyword `needs:` or are referred to by one.
......
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