Add latest changes from gitlab-org/gitlab@master

3 files changed, 17 insertions, 1 deletions

diff --git a/db/migrate/20210218142626_change_finding_fingerprint_enum.rb b/db/migrate/20210218142626_change_finding_fingerprint_enum.rb
new file mode 100644
index 00000000000..615509e0c04
--- /dev/null
+++ b/db/migrate/20210218142626_change_finding_fingerprint_enum.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class ChangeFindingFingerprintEnum < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def up
+    change_column :vulnerability_finding_fingerprints, :algorithm_type, :integer, limit: 2
+  end
+
+  def down
+    change_column :vulnerability_finding_fingerprints, :algorithm_type, :integer
+  end
+end
diff --git a/db/schema_migrations/20210218142626 b/db/schema_migrations/20210218142626
new file mode 100644
index 00000000000..e23a8139ffb
--- /dev/null
+++ b/db/schema_migrations/20210218142626
@@ -0,0 +1 @@
+063c97800eec5bfc7f6879dbe559fa39952295d5ba947cf44ad03ac23212e924
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 7d10a327477..d0632eab17a 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -18258,7 +18258,7 @@ CREATE TABLE vulnerability_finding_fingerprints (
     finding_id bigint NOT NULL,
     created_at timestamp with time zone NOT NULL,
     updated_at timestamp with time zone NOT NULL,
-    algorithm_type integer NOT NULL,
+    algorithm_type smallint NOT NULL,
     fingerprint_sha256 bytea NOT NULL
 );