diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
| commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
| tree | 78be5963ec075d80116a932011d695dd33910b4e /app/uploaders/packages | |
| parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) | |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'app/uploaders/packages')
| -rw-r--r-- | app/uploaders/packages/package_file_uploader.rb | 7 |
1 files changed, 1 insertions, 6 deletions
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 |