Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42

1 files changed, 15 insertions, 0 deletions

diff --git a/db/migrate/20211008043855_remove_notes_trigram_index.rb b/db/migrate/20211008043855_remove_notes_trigram_index.rb
new file mode 100644
index 00000000000..a20ef1852e2
--- /dev/null
+++ b/db/migrate/20211008043855_remove_notes_trigram_index.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class RemoveNotesTrigramIndex < Gitlab::Database::Migration[1.0]
+  disable_ddl_transaction!
+
+  NOTES_TRIGRAM_INDEX_NAME = 'index_notes_on_note_trigram'
+
+  def up
+    remove_concurrent_index_by_name(:notes, NOTES_TRIGRAM_INDEX_NAME)
+  end
+
+  def down
+    add_concurrent_index :notes, :note, name: NOTES_TRIGRAM_INDEX_NAME, using: :gin, opclass: { content: :gin_trgm_ops }
+  end
+end