From 49dfcd0c5163ef50e9c61b09ea031d5d391fe10a Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Tue, 23 Jan 2018 13:59:44 +0000 Subject: Merge branch 'vendor-10-4-auto-devops-template' into 'master' Vendor 10.4 Auto DevOps template See merge request gitlab-org/gitlab-ce!16639 --- vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'vendor') diff --git a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml index eec356b9f47..ca5b0bf0764 100644 --- a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml +++ b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml @@ -462,6 +462,11 @@ production: } function create_secret() { +<<<<<<< HEAD +======= + echo "Create secret..." + +>>>>>>> ea14c1e6963... Merge branch 'vendor-10-4-auto-devops-template' into 'master' kubectl create secret -n "$KUBE_NAMESPACE" \ docker-registry gitlab-registry \ --docker-server="$CI_REGISTRY" \ -- cgit v1.2.3