Add latest changes from gitlab-org/gitlab@16-1-stable-eev16.1.0-rc42

1 files changed, 17 insertions, 0 deletions

diff --git a/db/post_migrate/20230529185110_cleanup_temporary_activity_index.rb b/db/post_migrate/20230529185110_cleanup_temporary_activity_index.rb
new file mode 100644
index 00000000000..d3e75aa7975
--- /dev/null
+++ b/db/post_migrate/20230529185110_cleanup_temporary_activity_index.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class CleanupTemporaryActivityIndex < Gitlab::Database::Migration[2.1]
+  disable_ddl_transaction!
+
+  INDEX_NAME = 'i_users_on_last_activity_for_active_human_service_migration'
+
+  def up
+    remove_concurrent_index_by_name :users, INDEX_NAME
+  end
+
+  def down
+    add_concurrent_index :users, [:id, :last_activity_on],
+      name: INDEX_NAME,
+      where: "state = 'active' AND ((user_type IS NULL) OR (user_type = 0) OR (user_type = 4))"
+  end
+end