summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2019-05-15 18:49:40 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2019-05-15 18:49:40 +0000
commitb2ed767b533b025117e1aa2e9e06f4f050f14211 (patch)
tree8677217fe9ef911b2e466570278506e40dd7d5a7
parent8e54b85631d02d9dd4609e12334f47040000dd57 (diff)
parent37ac7a2d8c641d18b6754bdbea546a48f15b60b9 (diff)
downloadgitlab-ce-b2ed767b533b025117e1aa2e9e06f4f050f14211.tar.gz
Merge branch 'patch-55' into 'master'
Removed the unnecessary line. It would be covered anyway by line 352... See merge request gitlab-org/gitlab-ce!28228
-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 9d99d04d263..876f53c66ba 100644
--- a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
@@ -338,7 +338,6 @@ rollout 100%:
image_tag=${CI_APPLICATION_TAG:-$CI_COMMIT_TAG}
fi
- replicas="1"
service_enabled="true"
postgres_enabled="$POSTGRES_ENABLED"