summaryrefslogtreecommitdiff
path: root/doc/ci
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2019-08-22 11:25:28 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2019-08-22 11:25:28 +0000
commite84f5a673e254c1e7084821a6d7c6ba919679aa5 (patch)
tree1460ab444d3105cf8202b2c17c60615586ca0344 /doc/ci
parentde7328b1e1e38a2534857d929f3f0b2c5a48897c (diff)
parente9169333fe9bbca1628a0f51a09515f83b588419 (diff)
downloadgitlab-ce-e84f5a673e254c1e7084821a6d7c6ba919679aa5.tar.gz
Merge branch 'docs-improve_doc_about_bridge_jobs_limitations' into 'master'
Improve doc about bridge job limitations See merge request gitlab-org/gitlab-ce!32058
Diffstat (limited to 'doc/ci')
-rw-r--r--doc/ci/multi_project_pipelines.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/ci/multi_project_pipelines.md b/doc/ci/multi_project_pipelines.md
index cb8d383f7d9..61f260cb70d 100644
--- a/doc/ci/multi_project_pipelines.md
+++ b/doc/ci/multi_project_pipelines.md
@@ -205,5 +205,5 @@ Some features are not implemented yet. For example, support for environments.
- `stage`
- `allow_failure`
- `only` and `except`
-- `when`
+- `when` (only with `on_success`, `on_failure`, and `always` values)
- `extends`