Merge branch 'add_overriden_uuid_column' into 'master'

Add overridden_uuid column to security_findings

See merge request gitlab-org/gitlab!66689

db/migrate/20210722210041_add_overridden_uuid_to_security_findings.rb

+# frozen_string_literal: true
+
+class AddOverriddenUuidToSecurityFindings < ActiveRecord::Migration[6.1]
+  include Gitlab::Database::MigrationHelpers
+
+  def up
+    with_lock_retries do
+      add_column :security_findings, :overridden_uuid, :uuid, null: true
+    end
+  end
+
+  def down
+    with_lock_retries do
+      remove_column :security_findings, :overridden_uuid
+    end
+  end
+end

db/schema_migrations/20210722210041

+253a3520f05e252b6e6bbb3ef5f8af6c374c897ffa736c89fbea3089fdfa8fc4
\ No newline at end of file

db/structure.sql

@@ -17924,6 +17924,7 @@ CREATE TABLE security_findings (
     deduplicated boolean DEFAULT false NOT NULL,
     "position" integer,
     uuid uuid,
+    overridden_uuid uuid,
     CONSTRAINT check_b9508c6df8 CHECK ((char_length(project_fingerprint) <= 40))
 );