Add latest changes from gitlab-org/gitlab@13-3-stable-ee

1 files changed, 1 insertions, 6 deletions

diff --git a/app/uploaders/job_artifact_uploader.rb b/app/uploaders/job_artifact_uploader.rb
index 400f0b3dcc6..47976c909e8 100644
--- a/app/uploaders/job_artifact_uploader.rb
+++ b/app/uploaders/job_artifact_uploader.rb
@@ -36,15 +36,10 @@ class JobArtifactUploader < GitlabUploader
   end
 
   def hashed_path
-    File.join(disk_hash[0..1], disk_hash[2..3], disk_hash,
-      model.created_at.utc.strftime('%Y_%m_%d'), model.job_id.to_s, model.id.to_s)
+    Gitlab::HashedPath.new(model.created_at.utc.strftime('%Y_%m_%d'), model.job_id, model.id, root_hash: model.project_id)
   end
 
   def legacy_path
     File.join(model.created_at.utc.strftime('%Y_%m'), model.project_id.to_s, model.job_id.to_s)
   end
-
-  def disk_hash
-    @disk_hash ||= Digest::SHA2.hexdigest(model.project_id.to_s)
-  end
 end