Merging conflicts for ee_compat_check

Base MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22010

scripts/review_apps/review-apps.sh

@@ -48,10 +48,10 @@ function create_secret() {
 }
 
 function deployExists() {
-    local namespace="${1}"
-    local deploy="${2}"
-    helm status --tiller-namespace "${namespace}" "${deploy}" >/dev/null 2>&1
-    return $?
+  local namespace="${1}"
+  local deploy="${2}"
+  helm status --tiller-namespace "${namespace}" "${deploy}" >/dev/null 2>&1
+  return $?
 }
 
 function previousDeployFailed() {