Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42

1 files changed, 17 insertions, 0 deletions

diff --git a/db/migrate/20211027203950_add_updated_index_for_dormant_users.rb b/db/migrate/20211027203950_add_updated_index_for_dormant_users.rb
new file mode 100644
index 00000000000..8b004af06c0
--- /dev/null
+++ b/db/migrate/20211027203950_add_updated_index_for_dormant_users.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddUpdatedIndexForDormantUsers < Gitlab::Database::Migration[1.0]
+  INDEX_NAME = 'index_users_on_id_and_last_activity_on_for_active_human_service'
+
+  disable_ddl_transaction!
+
+  def up
+    index_condition = "state = 'active' AND (users.user_type IS NULL OR users.user_type = 4)"
+
+    add_concurrent_index :users, [:id, :last_activity_on], where: index_condition, name: INDEX_NAME
+  end
+
+  def down
+    remove_concurrent_index_by_name :users, INDEX_NAME
+  end
+end