Add latest changes from gitlab-org/gitlab@16-7-stable-eev16.7.0-rc42

1 files changed, 28 insertions, 0 deletions

diff --git a/db/post_migrate/20231208103049_drop_index_users_on_id_and_last_activity.rb b/db/post_migrate/20231208103049_drop_index_users_on_id_and_last_activity.rb
new file mode 100644
index 00000000000..bf9b1800c68
--- /dev/null
+++ b/db/post_migrate/20231208103049_drop_index_users_on_id_and_last_activity.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+class DropIndexUsersOnIdAndLastActivity < Gitlab::Database::Migration[2.2]
+  milestone '16.7'
+
+  disable_ddl_transaction!
+
+  TABLE_NAME = :users
+  INDEX_NAME = :index_users_on_id_and_last_activity_on_for_active_human_service
+
+  def up
+    return unless should_run?
+
+    remove_concurrent_index_by_name TABLE_NAME, INDEX_NAME
+  end
+
+  def down
+    return unless should_run?
+
+    add_concurrent_index :users, [:id, :last_activity_on],
+      name: INDEX_NAME,
+      where: "state = 'active' AND user_type IN (0, 4)"
+  end
+
+  def should_run?
+    Gitlab.com_except_jh?
+  end
+end