Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42

1 files changed, 20 insertions, 0 deletions

diff --git a/db/migrate/20220119170426_remove_temporary_vulnerability_occurrences_deduplication_index.rb b/db/migrate/20220119170426_remove_temporary_vulnerability_occurrences_deduplication_index.rb
new file mode 100644
index 00000000000..26859beb671
--- /dev/null
+++ b/db/migrate/20220119170426_remove_temporary_vulnerability_occurrences_deduplication_index.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class RemoveTemporaryVulnerabilityOccurrencesDeduplicationIndex < Gitlab::Database::Migration[1.0]
+  MIGRATION = 'RecalculateVulnerabilitiesOccurrencesUuid'
+  INDEX_NAME = 'tmp_idx_deduplicate_vulnerability_occurrences'
+
+  disable_ddl_transaction!
+
+  def up
+    finalize_background_migration(MIGRATION)
+
+    remove_concurrent_index_by_name(:vulnerability_occurrences, INDEX_NAME)
+  end
+
+  def down
+    add_concurrent_index :vulnerability_occurrences,
+      %i[project_id report_type location_fingerprint primary_identifier_id id],
+      name: INDEX_NAME
+  end
+end