diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-17 18:09:44 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-17 18:09:44 +0000 |
commit | 2c156e3c7bbade01c36eee18327f1ced6eebea79 (patch) | |
tree | 115fa8dbf6bc05037378b380311d31acb805f54c /db | |
parent | 8e129497b2565b8c595ef4f806d9a9595ca654e5 (diff) | |
download | gitlab-ce-2c156e3c7bbade01c36eee18327f1ced6eebea79.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20200311141053_add_ci_pipeline_schedules_to_plan_limits.rb | 17 | ||||
-rw-r--r-- | db/migrate/20200311141943_insert_ci_pipeline_schedules_plan_limits.rb | 23 | ||||
-rw-r--r-- | db/schema.rb | 1 |
3 files changed, 41 insertions, 0 deletions
diff --git a/db/migrate/20200311141053_add_ci_pipeline_schedules_to_plan_limits.rb b/db/migrate/20200311141053_add_ci_pipeline_schedules_to_plan_limits.rb new file mode 100644 index 00000000000..2fc7785fe9c --- /dev/null +++ b/db/migrate/20200311141053_add_ci_pipeline_schedules_to_plan_limits.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +class AddCiPipelineSchedulesToPlanLimits < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + + disable_ddl_transaction! + + DOWNTIME = false + + def up + add_column_with_default(:plan_limits, :ci_pipeline_schedules, :integer, default: 0, allow_null: false) + end + + def down + remove_column(:plan_limits, :ci_pipeline_schedules) + end +end diff --git a/db/migrate/20200311141943_insert_ci_pipeline_schedules_plan_limits.rb b/db/migrate/20200311141943_insert_ci_pipeline_schedules_plan_limits.rb new file mode 100644 index 00000000000..d1ad5be5f85 --- /dev/null +++ b/db/migrate/20200311141943_insert_ci_pipeline_schedules_plan_limits.rb @@ -0,0 +1,23 @@ +# frozen_string_literal: true + +class InsertCiPipelineSchedulesPlanLimits < ActiveRecord::Migration[6.0] + DOWNTIME = false + + def change + return unless Gitlab.com? + + create_or_update_plan_limit('ci_pipeline_schedules', 'free', 10) + create_or_update_plan_limit('ci_pipeline_schedules', 'bronze', 50) + create_or_update_plan_limit('ci_pipeline_schedules', 'silver', 50) + create_or_update_plan_limit('ci_pipeline_schedules', 'gold', 50) + end + + def down + return unless Gitlab.com? + + create_or_update_plan_limit('ci_pipeline_schedules', 'free', 0) + create_or_update_plan_limit('ci_pipeline_schedules', 'bronze', 0) + create_or_update_plan_limit('ci_pipeline_schedules', 'silver', 0) + create_or_update_plan_limit('ci_pipeline_schedules', 'gold', 0) + end +end diff --git a/db/schema.rb b/db/schema.rb index c089c4f123a..5e6dfd05436 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -3148,6 +3148,7 @@ ActiveRecord::Schema.define(version: 2020_03_12_163407) do t.integer "project_hooks", default: 0, null: false t.integer "group_hooks", default: 0, null: false t.integer "ci_project_subscriptions", default: 0, null: false + t.integer "ci_pipeline_schedules", default: 0, null: false t.index ["plan_id"], name: "index_plan_limits_on_plan_id", unique: true end |