Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43

1 files changed, 19 insertions, 0 deletions

diff --git a/db/migrate/20210331180118_remove_deprecated_index_from_award_emoji.rb b/db/migrate/20210331180118_remove_deprecated_index_from_award_emoji.rb
new file mode 100644
index 00000000000..b8787eb171c
--- /dev/null
+++ b/db/migrate/20210331180118_remove_deprecated_index_from_award_emoji.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class RemoveDeprecatedIndexFromAwardEmoji < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+  INDEX_NAME = 'index_award_emoji_on_user_id_and_name'
+
+  disable_ddl_transaction!
+
+  def up
+    # Index deprecated in favor of idx_award_emoji_on_user_emoji_name_awardable_type_awardable_id
+    remove_concurrent_index_by_name(:award_emoji, INDEX_NAME)
+  end
+
+  def down
+    add_concurrent_index(:award_emoji, [:user_id, :name], name: INDEX_NAME)
+  end
+end