diff options
author | Matija Čupić <matteeyah@gmail.com> | 2018-06-06 19:09:46 +0200 |
---|---|---|
committer | Matija Čupić <matteeyah@gmail.com> | 2018-06-06 19:09:46 +0200 |
commit | 78ae23045bae8a75775a11675afd5836fb8f318b (patch) | |
tree | 831f45fdbab4c639703ddde20c6fb1a6affef736 | |
parent | 9738b0a42bdfca5b8fbf0a0ef2ade4d46be38c75 (diff) | |
download | gitlab-ce-78ae23045bae8a75775a11675afd5836fb8f318b.tar.gz |
Reverse logic of manual and continuous deploy strategies
-rw-r--r-- | app/models/project_auto_devops.rb | 2 | ||||
-rw-r--r-- | spec/models/project_auto_devops_spec.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/models/project_auto_devops.rb b/app/models/project_auto_devops.rb index 3c468831e91..ed0428615a2 100644 --- a/app/models/project_auto_devops.rb +++ b/app/models/project_auto_devops.rb @@ -26,7 +26,7 @@ class ProjectAutoDevops < ActiveRecord::Base value: domain.presence || instance_domain) end - if continuous? + if manual? variables.append(key: 'STAGING_ENABLED', value: 1) variables.append(key: 'INCREMENTAL_ROLLOUT_ENABLED', value: 1) end diff --git a/spec/models/project_auto_devops_spec.rb b/spec/models/project_auto_devops_spec.rb index 37cd1f571e5..040e76e28fc 100644 --- a/spec/models/project_auto_devops_spec.rb +++ b/spec/models/project_auto_devops_spec.rb @@ -69,11 +69,11 @@ describe ProjectAutoDevops do end end - context 'when deploy_strategy is continuous' do + context 'when deploy_strategy is manual' do let(:domain) { 'example.com' } before do - auto_devops.deploy_strategy = 'continuous' + auto_devops.deploy_strategy = 'manual' end it do |