Add latest changes from gitlab-org/gitlab@master

2 files changed, 18 insertions, 1 deletions

diff --git a/db/post_migrate/20231204042048_finalize_system_note_metadata_bigint_conversion.rb b/db/post_migrate/20231204042048_finalize_system_note_metadata_bigint_conversion.rb
index 2238c4e34c5..cd6550d6bad 100644
--- a/db/post_migrate/20231204042048_finalize_system_note_metadata_bigint_conversion.rb
+++ b/db/post_migrate/20231204042048_finalize_system_note_metadata_bigint_conversion.rb
@@ -6,7 +6,7 @@ class FinalizeSystemNoteMetadataBigintConversion < Gitlab::Database::Migration[2
   disable_ddl_transaction!
   restrict_gitlab_migration gitlab_schema: :gitlab_main
 
-  milestone '16.7'
+  milestone '16.8'
 
   TABLE_NAME = :system_note_metadata
 
diff --git a/db/post_migrate/20231219044006_drop_note_mentions_temp_index.rb b/db/post_migrate/20231219044006_drop_note_mentions_temp_index.rb
new file mode 100644
index 00000000000..948530d4c02
--- /dev/null
+++ b/db/post_migrate/20231219044006_drop_note_mentions_temp_index.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class DropNoteMentionsTempIndex < Gitlab::Database::Migration[2.2]
+  disable_ddl_transaction!
+
+  milestone '16.8'
+
+  INDEX_NAME = 'note_mentions_temp_index'
+
+  def up
+    remove_concurrent_index_by_name :notes, INDEX_NAME
+  end
+
+  def down
+    add_concurrent_index :notes, [:id, :noteable_type], where: "note ~~ '%@%'::text", name: INDEX_NAME
+  end
+end