diff options
| author | Mayra Cabrera <mcabrera@gitlab.com> | 2018-01-23 10:44:18 -0600 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2018-01-23 10:44:18 -0600 |
| commit | a1f878b8456a8f6104805cf982b2234ed463f92a (patch) | |
| tree | 755cbc34ce4aae9577f7ccb86ba99dce912a7376 | |
| parent | 49dfcd0c5163ef50e9c61b09ea031d5d391fe10a (diff) | |
| download | gitlab-ce-a1f878b8456a8f6104805cf982b2234ed463f92a.tar.gz | |
Resolve conflict for secret management on Auto-DevOps
| -rw-r--r-- | vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml index ca5b0bf0764..7046932342b 100644 --- a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml +++ b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml @@ -462,11 +462,8 @@ 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" \ |