Add latest changes from gitlab-org/gitlab@16-3-stable-eev16.3.0-rc42

1 files changed, 21 insertions, 0 deletions

diff --git a/db/post_migrate/20230808123136_cleanup_application_settings_database_apdex_settings_rename.rb b/db/post_migrate/20230808123136_cleanup_application_settings_database_apdex_settings_rename.rb
new file mode 100644
index 00000000000..de1887677bf
--- /dev/null
+++ b/db/post_migrate/20230808123136_cleanup_application_settings_database_apdex_settings_rename.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class CleanupApplicationSettingsDatabaseApdexSettingsRename < Gitlab::Database::Migration[2.1]
+  disable_ddl_transaction!
+
+  def up
+    cleanup_concurrent_column_rename(
+      :application_settings,
+      :database_apdex_settings,
+      :prometheus_alert_db_indicators_settings
+    )
+  end
+
+  def down
+    undo_cleanup_concurrent_column_rename(
+      :application_settings,
+      :database_apdex_settings,
+      :prometheus_alert_db_indicators_settings
+    )
+  end
+end