summaryrefslogtreecommitdiff
path: root/lib/gitlab
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2019-07-09 10:19:02 +0000
committerSean McGivern <sean@gitlab.com>2019-07-09 10:19:02 +0000
commit12422dbf10a1fca27b6f3c51224d3bb25ed173ed (patch)
tree42884211e14103c6f63b927c0ef06369384a7538 /lib/gitlab
parent7301cd142222dfed85fbcc9ec3fc6c20f33f70a9 (diff)
parent6e552981248a551e8c70c8d2866a401a8d1090b5 (diff)
downloadgitlab-ce-12422dbf10a1fca27b6f3c51224d3bb25ed173ed.tar.gz
Merge branch 'remove-comment-from-auto-deploy-yml' into 'master'
Remove obsolete comment See merge request gitlab-org/gitlab-ce!30388
Diffstat (limited to 'lib/gitlab')
-rw-r--r--lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
index dcf8254ef94..108f0119ae1 100644
--- a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
@@ -246,7 +246,6 @@ rollout 100%:
auto_database_url=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${CI_ENVIRONMENT_SLUG}-postgres:5432/${POSTGRES_DB}
export DATABASE_URL=${DATABASE_URL-$auto_database_url}
export TILLER_NAMESPACE=$KUBE_NAMESPACE
- # Extract "MAJOR.MINOR" from CI_SERVER_VERSION and generate "MAJOR-MINOR-stable" for Security Products
function get_replicas() {
track="${1:-stable}"