summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatija Čupić <matteeyah@gmail.com>2018-06-07 18:11:08 +0200
committerMatija Čupić <matteeyah@gmail.com>2018-06-07 18:11:08 +0200
commit2bc1835597446a1240cfb364d1943feb4080e675 (patch)
tree0e2b6096bf8816f744313d59512f0233363b5039
parent637b90db6edbd13d15289bf0d8d2c442d05442f0 (diff)
downloadgitlab-ce-2bc1835597446a1240cfb364d1943feb4080e675.tar.gz
Use 0 continuous default for deploy strategy
-rw-r--r--app/models/project_auto_devops.rb4
-rw-r--r--db/migrate/20180601213245_add_deploy_strategy_to_project_auto_devops.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/app/models/project_auto_devops.rb b/app/models/project_auto_devops.rb
index ed0428615a2..a6f728e478e 100644
--- a/app/models/project_auto_devops.rb
+++ b/app/models/project_auto_devops.rb
@@ -2,8 +2,8 @@ class ProjectAutoDevops < ActiveRecord::Base
belongs_to :project
enum deploy_strategy: {
- manual: 0,
- continuous: 1
+ continuous: 0,
+ manual: 1
}
scope :enabled, -> { where(enabled: true) }
diff --git a/db/migrate/20180601213245_add_deploy_strategy_to_project_auto_devops.rb b/db/migrate/20180601213245_add_deploy_strategy_to_project_auto_devops.rb
index 0f6bd0dd581..6f50d428965 100644
--- a/db/migrate/20180601213245_add_deploy_strategy_to_project_auto_devops.rb
+++ b/db/migrate/20180601213245_add_deploy_strategy_to_project_auto_devops.rb
@@ -10,7 +10,7 @@ class AddDeployStrategyToProjectAutoDevops < ActiveRecord::Migration
disable_ddl_transaction!
def up
- add_column_with_default :project_auto_devops, :deploy_strategy, :integer, default: 1, allow_null: false
+ add_column_with_default :project_auto_devops, :deploy_strategy, :integer, default: 0, allow_null: false
end
def down