Add latest changes from gitlab-org/gitlab@master

1 files changed, 19 insertions, 0 deletions

diff --git a/db/migrate/20200320112455_add_cost_factor_fileds_to_ci_runners.rb b/db/migrate/20200320112455_add_cost_factor_fileds_to_ci_runners.rb
new file mode 100644
index 00000000000..472baa32340
--- /dev/null
+++ b/db/migrate/20200320112455_add_cost_factor_fileds_to_ci_runners.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class AddCostFactorFiledsToCiRunners < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    add_column_with_default(:ci_runners, :public_projects_minutes_cost_factor, :float, allow_null: false, default: 0.0)
+    add_column_with_default(:ci_runners, :private_projects_minutes_cost_factor, :float, allow_null: false, default: 1.0)
+  end
+
+  def down
+    remove_column(:ci_runners, :public_projects_minutes_cost_factor)
+    remove_column(:ci_runners, :private_projects_minutes_cost_factor)
+  end
+end