Add latest changes from gitlab-org/gitlab@master

3 files changed, 10 insertions, 2 deletions

diff --git a/doc/development/code_review.md b/doc/development/code_review.md
index 77c57bb332d..326ac7b3a37 100644
--- a/doc/development/code_review.md
+++ b/doc/development/code_review.md
@@ -181,6 +181,10 @@ vulnerabilities must be either empty or containing:
 Maintainers should **never** dismiss vulnerabilities to "empty" the list,
 without duly verifying them.
 
+Note that certain Merge Requests may target a stable branch.  These are rare
+events.  These types of Merge Requests cannot be merged by the Maintainer.
+Instead these should be sent to the [Release Manager](https://about.gitlab.com/community/release-managers/).
+
 ## Best practices
 
 ### Everyone
diff --git a/doc/development/pipelines.md b/doc/development/pipelines.md
index 764bd68000d..7ec76f61e42 100644
--- a/doc/development/pipelines.md
+++ b/doc/development/pipelines.md
@@ -191,8 +191,8 @@ subgraph "`review-prepare` stage"
     end
 
 subgraph "`review` stage"
-    G --> |needs| E;
-    G2 --> |needs| E;
+    G
+    G2
     end
 
 subgraph "`qa` stage"
diff --git a/doc/development/testing_guide/review_apps.md b/doc/development/testing_guide/review_apps.md
index ecfcbc731e1..eddfb561748 100644
--- a/doc/development/testing_guide/review_apps.md
+++ b/doc/development/testing_guide/review_apps.md
@@ -129,6 +129,10 @@ two node pools:
 
 ### Helm/Tiller
 
+The Helm/Tiller version used is defined in the
+[`registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-charts-build-base` image](https://gitlab.com/gitlab-org/gitlab-build-images/blob/master/Dockerfile.gitlab-charts-build-base#L4)
+used by the `review-deploy` and `review-stop` jobs.
+
 The `tiller` deployment (the Helm server) is deployed to a dedicated node pool
 that has the `app=helm` label and a specific
 [taint](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/)