Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

1 files changed, 23 insertions, 0 deletions

diff --git a/db/migrate/20210602122213_add_upcoming_reconciliations.rb b/db/migrate/20210602122213_add_upcoming_reconciliations.rb
new file mode 100644
index 00000000000..90d0013b357
--- /dev/null
+++ b/db/migrate/20210602122213_add_upcoming_reconciliations.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class AddUpcomingReconciliations < ActiveRecord::Migration[6.1]
+  include Gitlab::Database::MigrationHelpers
+
+  def up
+    with_lock_retries do
+      create_table :upcoming_reconciliations do |t|
+        t.references :namespace, index: { unique: true }, null: true, foreign_key: { on_delete: :cascade }
+        t.date :next_reconciliation_date, null: false
+        t.date :display_alert_from, null: false
+
+        t.timestamps_with_timezone
+      end
+    end
+  end
+
+  def down
+    with_lock_retries do
+      drop_table :upcoming_reconciliations
+    end
+  end
+end