Add latest changes from gitlab-org/gitlab@master

5 files changed, 40 insertions, 1 deletions

diff --git a/db/migrate/20211105160316_create_dotenv_application_limits.rb b/db/migrate/20211105160316_create_dotenv_application_limits.rb
new file mode 100644
index 00000000000..3ea94fd60fc
--- /dev/null
+++ b/db/migrate/20211105160316_create_dotenv_application_limits.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class CreateDotenvApplicationLimits < Gitlab::Database::Migration[1.0]
+  def change
+    add_column(:plan_limits, :dotenv_variables, :integer, default: 20, null: false)
+    add_column(:plan_limits, :dotenv_size, :integer, default: 5.kilobytes, null: false)
+  end
+end
diff --git a/db/migrate/20211105161404_insert_dotenv_application_limits.rb b/db/migrate/20211105161404_insert_dotenv_application_limits.rb
new file mode 100644
index 00000000000..2749cf4a019
--- /dev/null
+++ b/db/migrate/20211105161404_insert_dotenv_application_limits.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class InsertDotenvApplicationLimits < Gitlab::Database::Migration[1.0]
+  def up
+    create_or_update_plan_limit('dotenv_variables', 'default', 150)
+    create_or_update_plan_limit('dotenv_variables', 'free', 50)
+    create_or_update_plan_limit('dotenv_variables', 'opensource', 150)
+    create_or_update_plan_limit('dotenv_variables', 'premium', 100)
+    create_or_update_plan_limit('dotenv_variables', 'premium_trial', 100)
+    create_or_update_plan_limit('dotenv_variables', 'ultimate', 150)
+    create_or_update_plan_limit('dotenv_variables', 'ultimate_trial', 150)
+
+    create_or_update_plan_limit('dotenv_size', 'default', 5.kilobytes)
+  end
+
+  def down
+    create_or_update_plan_limit('dotenv_variables', 'default', 20)
+    create_or_update_plan_limit('dotenv_variables', 'free', 20)
+    create_or_update_plan_limit('dotenv_variables', 'opensource', 20)
+    create_or_update_plan_limit('dotenv_variables', 'premium', 20)
+    create_or_update_plan_limit('dotenv_variables', 'premium_trial', 20)
+    create_or_update_plan_limit('dotenv_variables', 'ultimate', 20)
+    create_or_update_plan_limit('dotenv_variables', 'ultimate_trial', 20)
+
+    create_or_update_plan_limit('dotenv_size', 'default', 5.kilobytes)
+  end
+end
diff --git a/db/schema_migrations/20211105160316 b/db/schema_migrations/20211105160316
new file mode 100644
index 00000000000..493dfb4afbd
--- /dev/null
+++ b/db/schema_migrations/20211105160316
@@ -0,0 +1 @@
+afb9552a4104b10b25d65a9fec478c5c28a31ec31402400554db4288033bacb6
\ No newline at end of file
diff --git a/db/schema_migrations/20211105161404 b/db/schema_migrations/20211105161404
new file mode 100644
index 00000000000..98b4bcdacfb
--- /dev/null
+++ b/db/schema_migrations/20211105161404
@@ -0,0 +1 @@
+911cc21de320d0d5716ce80ebca56433b793c2072cb62da783605c99bb9aada9
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 669d2549dd8..83eaafdd9bc 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -17574,7 +17574,9 @@ CREATE TABLE plan_limits (
     ci_jobs_trace_size_limit integer DEFAULT 100 NOT NULL,
     pages_file_entries integer DEFAULT 200000 NOT NULL,
     dast_profile_schedules integer DEFAULT 1 NOT NULL,
-    external_audit_event_destinations integer DEFAULT 5 NOT NULL
+    external_audit_event_destinations integer DEFAULT 5 NOT NULL,
+    dotenv_variables integer DEFAULT 20 NOT NULL,
+    dotenv_size integer DEFAULT 5120 NOT NULL
 );
 
 CREATE SEQUENCE plan_limits_id_seq