Add latest changes from gitlab-org/gitlab@master

3 files changed, 23 insertions, 1 deletions

diff --git a/db/migrate/20221219112632_add_next_over_limit_check_at_to_namespace_details.rb b/db/migrate/20221219112632_add_next_over_limit_check_at_to_namespace_details.rb
new file mode 100644
index 00000000000..dd2acbfd0bb
--- /dev/null
+++ b/db/migrate/20221219112632_add_next_over_limit_check_at_to_namespace_details.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class AddNextOverLimitCheckAtToNamespaceDetails < Gitlab::Database::Migration[2.1]
+  disable_ddl_transaction!
+
+  TABLE_NAME = :namespace_details
+  COLUMN = :next_over_limit_check_at
+
+  def up
+    with_lock_retries do
+      add_column TABLE_NAME, COLUMN, :datetime_with_timezone, null: true
+    end
+  end
+
+  def down
+    with_lock_retries do
+      remove_column TABLE_NAME, COLUMN
+    end
+  end
+end
diff --git a/db/schema_migrations/20221219112632 b/db/schema_migrations/20221219112632
new file mode 100644
index 00000000000..0bba0080af7
--- /dev/null
+++ b/db/schema_migrations/20221219112632
@@ -0,0 +1 @@
+400cab0a2d3130dd7406024cf982c7312918019197ae06af06696435f6bb5aaa
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 005df75da1f..067e8646819 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -18310,7 +18310,8 @@ CREATE TABLE namespace_details (
     free_user_cap_over_limt_notified_at timestamp with time zone,
     free_user_cap_over_limit_notified_at timestamp with time zone,
     dashboard_notification_at timestamp with time zone,
-    dashboard_enforcement_at timestamp with time zone
+    dashboard_enforcement_at timestamp with time zone,
+    next_over_limit_check_at timestamp with time zone
 );
 
 CREATE TABLE namespace_limits (