Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42

1 files changed, 26 insertions, 0 deletions

diff --git a/db/post_migrate/20220919041604_drop_unused_fields_from_merge_request_reviewers.rb b/db/post_migrate/20220919041604_drop_unused_fields_from_merge_request_reviewers.rb
new file mode 100644
index 00000000000..d9f98557f75
--- /dev/null
+++ b/db/post_migrate/20220919041604_drop_unused_fields_from_merge_request_reviewers.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class DropUnusedFieldsFromMergeRequestReviewers < Gitlab::Database::Migration[2.0]
+  disable_ddl_transaction!
+
+  def up
+    with_lock_retries do
+      if column_exists?(:merge_request_reviewers, :updated_state_by_user_id)
+        remove_column :merge_request_reviewers, :updated_state_by_user_id
+      end
+    end
+  end
+
+  def down
+    with_lock_retries do
+      unless column_exists?(:merge_request_reviewers, :updated_state_by_user_id)
+        add_column :merge_request_reviewers, :updated_state_by_user_id, :bigint
+      end
+    end
+
+    add_concurrent_index :merge_request_reviewers, :updated_state_by_user_id,
+      name: 'index_on_merge_request_reviewers_updated_state_by_user_id'
+
+    add_concurrent_foreign_key :merge_request_reviewers, :users, column: :updated_state_by_user_id, on_delete: :nullify
+  end
+end