summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMayra Cabrera <mcabrera@gitlab.com>2019-06-04 17:06:56 +0000
committerMayra Cabrera <mcabrera@gitlab.com>2019-06-04 17:06:56 +0000
commit4c27abb42f99d65a5611df825a3b35c7db0ecd1c (patch)
tree7538bb97c0c40e3fece5fb0311a1ef2928e68487 /lib
parent9274463812106e920459b774d3cf889e45905d8f (diff)
parent55e1906df715623f173f670a225c2e063c8734d0 (diff)
downloadgitlab-ce-4c27abb42f99d65a5611df825a3b35c7db0ecd1c.tar.gz
Merge branch 'bump-auto-devops-helm-2-14-0' into 'master'
Bump Helm version in Auto-DevOps.gitlab-ci.yml See merge request gitlab-org/gitlab-ce!28527
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
index 87cd62ef2d4..32ab216dd55 100644
--- a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
@@ -51,7 +51,7 @@ variables:
POSTGRES_VERSION: 9.6.2
KUBERNETES_VERSION: 1.11.10
- HELM_VERSION: 2.13.1
+ HELM_VERSION: 2.14.0
DOCKER_DRIVER: overlay2
@@ -89,4 +89,4 @@ include:
dast:
except:
refs:
- - master \ No newline at end of file
+ - master