summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-24 21:07:54 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-24 21:07:54 +0000
commitc4db541c1b2c97ab1eda354ea3899489fe5c33e5 (patch)
tree45d5d381232179082ea11136e3b53211b37349d5 /db
parent603c7d4cac5e28bc1c75e50c23ed2cbe56f1aafc (diff)
downloadgitlab-ce-c4db541c1b2c97ab1eda354ea3899489fe5c33e5.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20200319123041_update_plan_limits_defaults.rb19
-rw-r--r--db/structure.sql9
2 files changed, 24 insertions, 4 deletions
diff --git a/db/migrate/20200319123041_update_plan_limits_defaults.rb b/db/migrate/20200319123041_update_plan_limits_defaults.rb
new file mode 100644
index 00000000000..252af26cb7f
--- /dev/null
+++ b/db/migrate/20200319123041_update_plan_limits_defaults.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class UpdatePlanLimitsDefaults < ActiveRecord::Migration[6.0]
+ DOWNTIME = false
+
+ def up
+ change_column_default :plan_limits, :project_hooks, 100
+ change_column_default :plan_limits, :group_hooks, 50
+ change_column_default :plan_limits, :ci_project_subscriptions, 2
+ change_column_default :plan_limits, :ci_pipeline_schedules, 10
+ end
+
+ def down
+ change_column_default :plan_limits, :project_hooks, 0
+ change_column_default :plan_limits, :group_hooks, 0
+ change_column_default :plan_limits, :ci_project_subscriptions, 0
+ change_column_default :plan_limits, :ci_pipeline_schedules, 0
+ end
+end
diff --git a/db/structure.sql b/db/structure.sql
index ee6a249093d..af6fa7555bb 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -4508,10 +4508,10 @@ CREATE TABLE public.plan_limits (
ci_active_pipelines integer DEFAULT 0 NOT NULL,
ci_pipeline_size integer DEFAULT 0 NOT NULL,
ci_active_jobs integer DEFAULT 0 NOT NULL,
- project_hooks integer DEFAULT 0 NOT NULL,
- group_hooks integer DEFAULT 0 NOT NULL,
- ci_project_subscriptions integer DEFAULT 0 NOT NULL,
- ci_pipeline_schedules integer DEFAULT 0 NOT NULL
+ project_hooks integer DEFAULT 100 NOT NULL,
+ group_hooks integer DEFAULT 50 NOT NULL,
+ ci_project_subscriptions integer DEFAULT 2 NOT NULL,
+ ci_pipeline_schedules integer DEFAULT 10 NOT NULL
);
CREATE SEQUENCE public.plan_limits_id_seq
@@ -12747,6 +12747,7 @@ INSERT INTO "schema_migrations" (version) VALUES
('20200318164448'),
('20200318165448'),
('20200318175008'),
+('20200319123041'),
('20200319203901'),
('20200323075043'),
('20200323122201');