Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42

1 files changed, 13 insertions, 0 deletions

diff --git a/db/migrate/20220530104431_add_timestamps_to_compliance_frameworks.rb b/db/migrate/20220530104431_add_timestamps_to_compliance_frameworks.rb
new file mode 100644
index 00000000000..88013fddc81
--- /dev/null
+++ b/db/migrate/20220530104431_add_timestamps_to_compliance_frameworks.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class AddTimestampsToComplianceFrameworks < Gitlab::Database::Migration[2.0]
+  def up
+    add_column :compliance_management_frameworks, :created_at, :datetime_with_timezone, null: true
+    add_column :compliance_management_frameworks, :updated_at, :datetime_with_timezone, null: true
+  end
+
+  def down
+    remove_column :compliance_management_frameworks, :created_at
+    remove_column :compliance_management_frameworks, :updated_at
+  end
+end