Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 6 deletions

diff --git a/db/post_migrate/20220920214524_remove_task_system_note_rename_temp_index.rb b/db/post_migrate/20220920214524_remove_task_system_note_rename_temp_index.rb
index 54277aaa0cc..d3671d24578 100644
--- a/db/post_migrate/20220920214524_remove_task_system_note_rename_temp_index.rb
+++ b/db/post_migrate/20220920214524_remove_task_system_note_rename_temp_index.rb
@@ -1,15 +1,11 @@
 # frozen_string_literal: true
 
 class RemoveTaskSystemNoteRenameTempIndex < Gitlab::Database::Migration[2.0]
-  disable_ddl_transaction!
-
-  INDEX_NAME = 'tmp_index_system_note_metadata_on_id_where_task'
-
   def up
-    remove_concurrent_index_by_name :system_note_metadata, INDEX_NAME
+    # no-op
   end
 
   def down
-    add_concurrent_index :system_note_metadata, [:id, :action], where: "action = 'task'", name: INDEX_NAME
+    # no-op
   end
 end