Automatic merge of gitlab-org/gitlab-ce master

e55702ff · GitLab Bot · ff8e866a · 4c27abb4 · e55702ff · e55702ff
Commit e55702ff authored Jun 04, 2019 by GitLab Bot
Showing with 7 additions and 2 deletions

changelogs/unreleased/bump-auto-devops-helm-2-14-0.yml changelogs/unreleased/bump-auto-devops-helm-2-14-0.yml +5 -0

lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml +2 -2

No files found.
--- a/changelogs/unreleased/bump-auto-devops-helm-2-14-0.yml
+++ b/changelogs/unreleased/bump-auto-devops-helm-2-14-0.yml
+---
+title: Bump Helm version in Auto-DevOps.gitlab-ci.yml to 2.14.0
+merge_request: 28527
+author:
+type: other
--- 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