summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcia Ramos <marcia@gitlab.com>2019-01-04 17:08:25 +0000
committerMarcia Ramos <marcia@gitlab.com>2019-01-04 17:08:25 +0000
commitd85e04e45247a64c704a44a2c8abecba94972061 (patch)
treef0cd3a36b24134eaeb85fb6d4782dfb6e1b5ebb2
parentb97b85c37e77e5d37705cb2d3a60161896585420 (diff)
parentce09844e8469af771662e290746091ab4bebaf54 (diff)
downloadgitlab-ce-d85e04e45247a64c704a44a2c8abecba94972061.tar.gz
Merge branch 'docs-fix-only-except-default' into 'master'
Improve documentation about only except default values Closes #55699 See merge request gitlab-org/gitlab-ce!24016
-rw-r--r--doc/ci/yaml/README.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index fdb57532770..fe09af24fa3 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -392,8 +392,8 @@ job:
The above example will run `job` for all branches on `gitlab-org/gitlab-ce`,
except master.
-If a job does not have neither `only` nor `except` rule,
-`only: ['branches', 'tags']` is set by default.
+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.
For example,