diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-10 21:08:17 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-10 21:08:17 +0300 |
commit | 219eead23f9feb5da9ec378c451d773aea2dfe61 (patch) | |
tree | eec14421a05ca8eb79f3cc782abe99532bb6070c /db | |
parent | 7c38405be9e79099f399aa429503ea7b463bbf5a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
-rw-r--r-- | db/post_migrate/20200304211738_remove_file_type_from_packages_package_files.rb | 9 | ||||
-rw-r--r-- | db/schema.rb | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/db/post_migrate/20200304211738_remove_file_type_from_packages_package_files.rb b/db/post_migrate/20200304211738_remove_file_type_from_packages_package_files.rb new file mode 100644 index 00000000000..98bce8845ab --- /dev/null +++ b/db/post_migrate/20200304211738_remove_file_type_from_packages_package_files.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class RemoveFileTypeFromPackagesPackageFiles < ActiveRecord::Migration[6.0] + DOWNTIME = false + + def change + remove_column :packages_package_files, :file_type, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 40cf50354db..2f1bcddb38f 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -3029,7 +3029,6 @@ ActiveRecord::Schema.define(version: 2020_03_06_170531) do t.datetime_with_timezone "created_at", null: false t.datetime_with_timezone "updated_at", null: false t.bigint "size" - t.integer "file_type" t.integer "file_store" t.binary "file_md5" t.binary "file_sha1" |