Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42

1 files changed, 18 insertions, 0 deletions

diff --git a/db/migrate/20210208125248_add_index_on_user_statuses_status_expires_at.rb b/db/migrate/20210208125248_add_index_on_user_statuses_status_expires_at.rb
new file mode 100644
index 00000000000..98f3449c2e8
--- /dev/null
+++ b/db/migrate/20210208125248_add_index_on_user_statuses_status_expires_at.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class AddIndexOnUserStatusesStatusExpiresAt < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+  INDEX_NAME = 'index_user_statuses_on_clear_status_at_not_null'
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index(:user_statuses, :clear_status_at, name: INDEX_NAME, where: 'clear_status_at IS NOT NULL')
+  end
+
+  def down
+    remove_concurrent_index_by_name(:user_statuses, INDEX_NAME)
+  end
+end