diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-09 03:07:56 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-09 03:07:56 +0000 |
commit | afa0ab923d697a3e737b04d078d3f28e0d573901 (patch) | |
tree | fa06ad775e52d99f1bd0fa2107452a2853fce015 /doc/development/pipelines.md | |
parent | e8793358645d6c84b46ef56dafcbf834f20d6415 (diff) | |
download | gitlab-ce-afa0ab923d697a3e737b04d078d3f28e0d573901.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/pipelines.md')
-rw-r--r-- | doc/development/pipelines.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/development/pipelines.md b/doc/development/pipelines.md index ba50b013c9f..7da74ae8b35 100644 --- a/doc/development/pipelines.md +++ b/doc/development/pipelines.md @@ -132,11 +132,11 @@ for the list of exact patterns.** ## Rules conditions and changes patterns We're making use of the [`rules` keyword](https://docs.gitlab.com/ee/ci/yaml/#rules) but we're currently -duplicating the `if` conditions and `changes` patterns lists since they cannot be shared accross +duplicating the `if` conditions and `changes` patterns lists since they cannot be shared across `include`d files as we do with `extends`. **If you update an `if` condition or `changes` -patterns list, make sure to mass-update those accross all the CI config files (i.e. `.gitlab/ci/*.yml`).** +patterns list, make sure to mass-update those across all the CI config files (i.e. `.gitlab/ci/*.yml`).** ### Canonical commits only |