summaryrefslogtreecommitdiff
path: root/doc/ci/environments.md
diff options
context:
space:
mode:
authorZ.J. van de Weg <git@zjvandeweg.nl>2017-02-20 14:05:44 +0100
committerZ.J. van de Weg <git@zjvandeweg.nl>2017-02-20 14:05:44 +0100
commit2b0e8b86d8aa35ac094d18bfefaa81af916347fa (patch)
treea0469ccf9e179832b2231c7f2abfa23956a4048f /doc/ci/environments.md
parent444d71e043eb19979ec1b08504b2760910cb2a47 (diff)
parentc89449e6110c2bdf6e1410bae3e7b7d807c5e305 (diff)
downloadgitlab-ce-2b0e8b86d8aa35ac094d18bfefaa81af916347fa.tar.gz
Merge branch 'master' into zj-create-mattermost-team
Diffstat (limited to 'doc/ci/environments.md')
-rw-r--r--doc/ci/environments.md5
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/ci/environments.md b/doc/ci/environments.md
index 3bba94f8b83..3c31ba45d3d 100644
--- a/doc/ci/environments.md
+++ b/doc/ci/environments.md
@@ -535,6 +535,7 @@ deploy_review:
- master
stop_review:
+ stage: deploy
variables:
GIT_STRATEGY: none
script:
@@ -555,7 +556,9 @@ when their associated branch is deleted.
When you have an environment that has a stop action defined (typically when
the environment describes a review app), GitLab will automatically trigger a
-stop action when the associated branch is deleted.
+stop action when the associated branch is deleted. The `stop_review` job must
+be in the same `stage` as the `deploy_review` one in order for the environment
+to automatically stop.
You can read more in the [`.gitlab-ci.yml` reference][onstop].