From 5edd0d173ff0bc377348bf3585fa309eee783e32 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 7 Aug 2020 18:09:53 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/uploaders/packages/package_file_uploader.rb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'app/uploaders/packages') diff --git a/app/uploaders/packages/package_file_uploader.rb b/app/uploaders/packages/package_file_uploader.rb index 20fcf0a7a32..28545b9fcdf 100644 --- a/app/uploaders/packages/package_file_uploader.rb +++ b/app/uploaders/packages/package_file_uploader.rb @@ -20,11 +20,6 @@ class Packages::PackageFileUploader < GitlabUploader private def dynamic_segment - File.join(disk_hash[0..1], disk_hash[2..3], disk_hash, - 'packages', model.package.id.to_s, 'files', model.id.to_s) - end - - def disk_hash - @disk_hash ||= Digest::SHA2.hexdigest(model.package.project_id.to_s) + Gitlab::HashedPath.new('packages', model.package.id, 'files', model.id, root_hash: model.package.project_id) end end -- cgit v1.2.3