Add latest changes from gitlab-org/gitlab@master

1 files changed, 20 insertions, 0 deletions

diff --git a/db/migrate/20231129231159_add_security_txt_content_to_application_settings.rb b/db/migrate/20231129231159_add_security_txt_content_to_application_settings.rb
new file mode 100644
index 00000000000..1072e8034fb
--- /dev/null
+++ b/db/migrate/20231129231159_add_security_txt_content_to_application_settings.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class AddSecurityTxtContentToApplicationSettings < Gitlab::Database::Migration[2.2]
+  milestone '16.7'
+  disable_ddl_transaction!
+
+  def up
+    with_lock_retries do
+      add_column :application_settings, :security_txt_content, :text, if_not_exists: true
+    end
+
+    add_text_limit :application_settings, :security_txt_content, 2048
+  end
+
+  def down
+    with_lock_retries do
+      remove_column :application_settings, :security_txt_content, if_exists: true
+    end
+  end
+end