summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2019-03-12 04:26:27 +0000
committerEvan Read <eread@gitlab.com>2019-03-12 04:26:27 +0000
commit121de6dc6f2aff66cc4068e1f34f0177ab5a9688 (patch)
treee20b10daacc20a708f58951ce7420f3ce16cbbfe
parent3ad300377ba4dcfd8e5280a12af084519c5991a7 (diff)
parent1f708ebb6603fd22619f622f7c8ddf160bf69806 (diff)
downloadgitlab-ce-121de6dc6f2aff66cc4068e1f34f0177ab5a9688.tar.gz
Merge branch 'olliverschinagl/gitlab-ce-clarify_master_branch_name' into 'master'
Olliverschinagl/gitlab ce clarify master branch name See merge request gitlab-org/gitlab-ce!25965
-rw-r--r--doc/ci/yaml/README.md3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index e295b696423..a44f4b62a0e 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -367,10 +367,11 @@ job:
- branches@gitlab-org/gitlab-ce
except:
- master@gitlab-org/gitlab-ce
+ - release/.*@gitlab-org/gitlab-ce
```
The above example will run `job` for all branches on `gitlab-org/gitlab-ce`,
-except master.
+except `master` and those with names prefixed with `release/`.
If a job does not have an `only` rule, `only: ['branches', 'tags']` is set by
default. If it doesn't have an `except` rule, it is empty.