summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2019-08-21 03:23:28 +0000
committerEvan Read <eread@gitlab.com>2019-08-21 03:23:28 +0000
commitdc859813e3af335e85cf5cb42e56f3a4c74dc78a (patch)
treea0817fe1803e4c787663d8478e0979d16171e30d
parentfa1ee60f410585df0ef4e97eb5cd593e149f0702 (diff)
parentca334da924dc2961e53e79456bb9e15ee81fd012 (diff)
downloadgitlab-ce-dc859813e3af335e85cf5cb42e56f3a4c74dc78a.tar.gz
Merge branch 'zm-rephrase-ci-docs' into 'master'
Update grammar in DAG docs See merge request gitlab-org/gitlab-ce!32021
-rw-r--r--doc/ci/directed_acyclic_graph/index.md2
-rw-r--r--doc/ci/yaml/README.md4
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/ci/directed_acyclic_graph/index.md b/doc/ci/directed_acyclic_graph/index.md
index e54be9f3bd9..1c38c08b7cb 100644
--- a/doc/ci/directed_acyclic_graph/index.md
+++ b/doc/ci/directed_acyclic_graph/index.md
@@ -65,7 +65,7 @@ as quickly as possible.
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,
-giving your powerful options for parallelization within your pipeline.
+giving you powerful options for parallelization within your pipeline.
## Limitations
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index 76b73729d0b..335f3292444 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -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)).
1. If `needs:` refers to a job that is marked as `parallel:`.
the current job will depend on all parallel jobs created.
-1. `needs:` is similar to `dependencies:` in that needs to use jobs from
- prior stages, this means that it is impossible to create circular
+1. `needs:` is similar to `dependencies:` in that it needs to use jobs from
+ 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)).
1. Related to the above, stages must be explicitly defined for all jobs
that have the keyword `needs:` or are referred to by one.