diff options
| author | Marin Jankovski <marin@gitlab.com> | 2018-01-23 16:59:44 +0300 |
|---|---|---|
| committer | Luke Bennett <lukeeeebennettplus@gmail.com> | 2018-01-23 19:27:06 +0300 |
| commit | 49dfcd0c5163ef50e9c61b09ea031d5d391fe10a (patch) | |
| tree | 3360c713c5f7d5155ad369fe49cd008d0182170f /vendor | |
| parent | 872eec831bc56bfdbe680974ee05c6034920b0de (diff) | |
Merge branch 'vendor-10-4-auto-devops-template' into 'master'
Vendor 10.4 Auto DevOps template
See merge request gitlab-org/gitlab-ce!16639
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml | 5 |
1 files changed, 5 insertions, 0 deletions
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" \ |