diff options
Diffstat (limited to 'app/models/project_auto_devops.rb')
| -rw-r--r-- | app/models/project_auto_devops.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/app/models/project_auto_devops.rb b/app/models/project_auto_devops.rb index e353a6443c4..d865c8832ed 100644 --- a/app/models/project_auto_devops.rb +++ b/app/models/project_auto_devops.rb @@ -6,13 +6,13 @@ class ProjectAutoDevops < ActiveRecord::Base enum deploy_strategy: { continuous: 0, manual: 1, - timed_incremental: 2 + timed_incremental: 2, } scope :enabled, -> { where(enabled: true) } scope :disabled, -> { where(enabled: false) } - validates :domain, allow_blank: true, hostname: { allow_numeric_hostname: true } + validates :domain, allow_blank: true, hostname: {allow_numeric_hostname: true} after_save :create_gitlab_deploy_token, if: :needs_to_create_deploy_token? @@ -33,7 +33,7 @@ class ProjectAutoDevops < ActiveRecord::Base def predefined_variables Gitlab::Ci::Variables::Collection.new.tap do |variables| if has_domain? - variables.append(key: 'AUTO_DEVOPS_DOMAIN', + variables.append(key: "AUTO_DEVOPS_DOMAIN", value: domain.presence || instance_domain) end @@ -59,11 +59,11 @@ class ProjectAutoDevops < ActiveRecord::Base def deployment_strategy_default_variables Gitlab::Ci::Variables::Collection.new.tap do |variables| if manual? - variables.append(key: 'STAGING_ENABLED', value: '1') - variables.append(key: 'INCREMENTAL_ROLLOUT_ENABLED', value: '1') # deprecated - variables.append(key: 'INCREMENTAL_ROLLOUT_MODE', value: 'manual') + variables.append(key: "STAGING_ENABLED", value: "1") + variables.append(key: "INCREMENTAL_ROLLOUT_ENABLED", value: "1") # deprecated + variables.append(key: "INCREMENTAL_ROLLOUT_MODE", value: "manual") elsif timed_incremental? - variables.append(key: 'INCREMENTAL_ROLLOUT_MODE', value: 'timed') + variables.append(key: "INCREMENTAL_ROLLOUT_MODE", value: "timed") end end end |