Merge branch 'docs/environments' into 'master'

Mention Git strategy none

See merge request !7530

1 files changed, 10 insertions, 0 deletions

diff --git a/doc/ci/environments.md b/doc/ci/environments.md
index aed17325b3a..cfb41307c43 100644
--- a/doc/ci/environments.md
+++ b/doc/ci/environments.md
@@ -422,6 +422,8 @@ deploy_review:
     - master
 
 stop_review:
+  variables:
+    GIT_STRATEGY: none
   script:
     - echo "Remove review app"
   when: manual
@@ -430,6 +432,10 @@ stop_review:
     action: stop
 ```
 
+Setting the [`GIT_STRATEGY`][git-strategy] to `none` is necessary on the
+`stop_review` job so that the [GitLab Runner] won't try to checkout the code
+after the branch is deleted.
+
 >**Note:**
 Starting with GitLab 8.14, dynamic environments will be stopped automatically
 when their associated branch is deleted.
@@ -445,6 +451,8 @@ You can read more in the [`.gitlab-ci.yml` reference][onstop].
 > [Introduced][ce-7015] in GitLab 8.14.
 
 As we've seen in the [dynamic environments](#dynamic-environments), you can
+prepend their name with a word, then followed by a `/` and finally the branch
+name which is automatically defined by the `CI_BUILD_REF_NAME` variable.
 
 In short, environments that are named like `type/foo` are presented under a
 group named `type`.
@@ -507,3 +515,5 @@ Below are some links you may find interesting:
 [only]: yaml/README.md#only-and-except
 [onstop]: yaml/README.md#environment-on_stop
 [ce-7015]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7015
+[gitlab runner]: https://docs.gitlab.com/runner/
+[git-strategy]: yaml/README.md#git-strategy