Add latest changes from gitlab-org/gitlab@master

2 files changed, 11 insertions, 1 deletions

diff --git a/db/migrate/20200318152134_adds_sha256_to_package_files.rb b/db/migrate/20200318152134_adds_sha256_to_package_files.rb
new file mode 100644
index 00000000000..26d2c1b97d4
--- /dev/null
+++ b/db/migrate/20200318152134_adds_sha256_to_package_files.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddsSha256ToPackageFiles < ActiveRecord::Migration[6.0]
+  DOWNTIME = false
+
+  def change
+    add_column :packages_package_files, :file_sha256, :binary
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 69ef887bfe5..ba3c1985593 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_03_16_111759) do
+ActiveRecord::Schema.define(version: 2020_03_18_152134) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_trgm"
@@ -3057,6 +3057,7 @@ ActiveRecord::Schema.define(version: 2020_03_16_111759) do
     t.binary "file_sha1"
     t.string "file_name", null: false
     t.text "file", null: false
+    t.binary "file_sha256"
     t.index ["package_id", "file_name"], name: "index_packages_package_files_on_package_id_and_file_name"
   end