summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-18 00:05:58 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-18 00:05:58 +0000
commit7f4a1ba886819078d1fa0bfc348e3743f0e2b2f2 (patch)
treeb4a4c4e996fd241cf2b306e0a670bc6addee2457
parent77fc73217e022d796ce25c0e684268b1efc680f4 (diff)
downloadgitlab-ce-7f4a1ba886819078d1fa0bfc348e3743f0e2b2f2.tar.gz
Add latest changes from gitlab-org/gitlab@master
-rw-r--r--changelogs/unreleased/auto-deploy-image-0-7-0.yml5
-rw-r--r--lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml2
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/auto-deploy-image-0-7-0.yml b/changelogs/unreleased/auto-deploy-image-0-7-0.yml
new file mode 100644
index 00000000000..ddb5b3d808d
--- /dev/null
+++ b/changelogs/unreleased/auto-deploy-image-0-7-0.yml
@@ -0,0 +1,5 @@
+---
+title: Bump Auto DevOps deploy image to v0.7.0
+merge_request: 20250
+author:
+type: other
diff --git a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
index c2d55fb3b86..738be44d5f4 100644
--- a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
@@ -1,5 +1,5 @@
.auto-deploy:
- image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image:v0.6.0"
+ image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image:v0.7.0"
review:
extends: .auto-deploy