Commit 0a4d4c0a authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Merge branch 'docs/clarify-new-text' into 'master'

Make text clearer

See merge request gitlab-org/gitlab-ce!32042
parents 8b0acc31 be273ce3
...@@ -524,7 +524,7 @@ single conjoined expression. That is: ...@@ -524,7 +524,7 @@ single conjoined expression. That is:
- `only:` means "include this job if all of the conditions match". - `only:` means "include this job if all of the conditions match".
- `except:` means "exclude this job if any 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) > (any of refs) AND (any of variables) AND (any of changes) AND (if kubernetes is active)
......
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