diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2019-08-21 13:05:54 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-08-21 13:05:54 +0000 |
| commit | 0a4d4c0a58162e695c3202c323d8febe833ef162 (patch) | |
| tree | a35a36e4a64db91f9c5ebef8d0ad8876354973ef | |
| parent | 8b0acc31281d7a2feabf4d7dfd4055b10b8184cd (diff) | |
| parent | be273ce3b4cddf2d4b767d033757fd0efeeb26d3 (diff) | |
| download | gitlab-ce-0a4d4c0a58162e695c3202c323d8febe833ef162.tar.gz | |
Merge branch 'docs/clarify-new-text' into 'master'
Make text clearer
See merge request gitlab-org/gitlab-ce!32042
| -rw-r--r-- | doc/ci/yaml/README.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index c957ed2cc6b..f7a67931793 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -524,7 +524,7 @@ single conjoined expression. That is: - `only:` means "include this job if all of the conditions match". - `except:` means "exclude this job if any of the conditions match". -The the individual keys are logically joined by an AND: +With `only`, individual keys are logically joined by an AND: > (any of refs) AND (any of variables) AND (any of changes) AND (if kubernetes is active) @@ -1735,7 +1735,7 @@ This example creates three paths of execution: 1. If `needs:` is set to point to a job that is not instantiated because of `only/except` rules or otherwise does not exist, the job will fail. -1. Note that on day one of the launch, we are temporarily limiting the +1. Note that on day one of the launch, we are temporarily limiting the maximum number of jobs that a single job can need in the `needs:` array. Track our [infrastructure issue](https://gitlab.com/gitlab-com/gl-infra/infrastructure/issues/7541) for details on the current limit. |