Add latest changes from gitlab-org/gitlab@master

3 files changed, 16 insertions, 1 deletions

diff --git a/db/fixtures/development/33_triage_ops.rb b/db/fixtures/development/33_triage_ops.rb
index 080e985fc5f..5d8b4a0a48f 100644
--- a/db/fixtures/development/33_triage_ops.rb
+++ b/db/fixtures/development/33_triage_ops.rb
@@ -192,7 +192,7 @@ class Gitlab::Seeder::TriageOps
     group = Group.new(
       name: group_path.titleize,
       path: group_path,
-      parent_id: parent&.id
+      parent: parent
     )
     group.description = FFaker::Lorem.sentence
     group.save!
diff --git a/db/post_migrate/20230404194907_remove_mr_mentions_temp_index.rb b/db/post_migrate/20230404194907_remove_mr_mentions_temp_index.rb
new file mode 100644
index 00000000000..49a2b22df0a
--- /dev/null
+++ b/db/post_migrate/20230404194907_remove_mr_mentions_temp_index.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class RemoveMrMentionsTempIndex < Gitlab::Database::Migration[2.1]
+  INDEX_NAME = 'merge_request_mentions_temp_index'
+
+  # TODO: Index to be destroyed synchronously in https://gitlab.com/gitlab-org/gitlab/-/issues/402497
+  def up
+    prepare_async_index_removal :merge_requests, :id, name: INDEX_NAME
+  end
+
+  def down
+    unprepare_async_index :merge_requests, :id, name: INDEX_NAME
+  end
+end
diff --git a/db/schema_migrations/20230404194907 b/db/schema_migrations/20230404194907
new file mode 100644
index 00000000000..76b16536f8d
--- /dev/null
+++ b/db/schema_migrations/20230404194907
@@ -0,0 +1 @@
+7dccec7b92a1ea97acad03086c8d7c05ee06d1afdb88ffe34d6e83b1ffe61ad3
\ No newline at end of file