Automatic merge of gitlab-org/gitlab-ce master

doc/ci/yaml/README.md

@@ -973,6 +973,8 @@ review_app:
 
 stop_review_app:
   stage: deploy
+  variables:
+    GIT_STRATEGY: none  
   script: make delete-app
   when: manual
   environment:
@@ -987,6 +989,10 @@ Once the `review_app` job is successfully finished, it will trigger the
 set it up to `manual` so it will need a [manual action](#whenmanual) via
 GitLab's web interface in order to run.
 
+Also in the example, `GIT_STRATEGY` is set to `none` so that GitLab Runner won’t
+try to check out the code after the branch is deleted when the `stop_review_app`
+job is [automatically triggered](../environments.md#automatically-stopping-an-environment).
+
 The `stop_review_app` job is **required** to have the following keywords defined:
 
 - `when` - [reference](#when)

doc/user/project/deploy_boards.md

@@ -125,6 +125,6 @@ version of your application.
 [kube-service]: integrations/kubernetes.md "Kubernetes project service"
 [review apps]: ../../ci/review_apps/index.md "Review Apps documentation"
 [variables]: ../../ci/variables/README.md "GitLab CI variables"
-[autodeploy]: ../../ci/autodeploy/index.md "GitLab Autodeploy"
+[autodeploy]: ../../topics/autodevops/index.md#auto-deploy "GitLab Autodeploy"
 [kube-image]: https://gitlab.com/gitlab-examples/kubernetes-deploy/container_registry "Kubernetes deploy Container Registry"
 [runners]: ../../ci/runners/README.md