Commit 526656e6 authored by Shinya Maeda's avatar Shinya Maeda

Rename current_path to hashed_path

parent 8e6faca7
......@@ -28,9 +28,9 @@ module Ci
##
# File location of the file
# legacy_path: File.join(model.created_at.utc.strftime('%Y_%m'), model.project_id.to_s, model.id.to_s)
# current_path: File.join(disk_hash[0..1], disk_hash[2..3], disk_hash, creation_date, model.job_id.to_s, model.id.to_s)
# hashed_path: File.join(disk_hash[0..1], disk_hash[2..3], disk_hash, creation_date, model.job_id.to_s, model.id.to_s)
enum file_location: {
current_path: nil,
hashed_path: nil,
legacy_path: 1
}
......
......@@ -31,7 +31,7 @@ class JobArtifactUploader < GitlabUploader
creation_date = model.created_at.utc.strftime('%Y_%m_%d')
if model.current_path?
if model.hashed_path?
File.join(disk_hash[0..1], disk_hash[2..3], disk_hash,
creation_date, model.job_id.to_s, model.id.to_s)
elsif model.legacy_path?
......
......@@ -26,9 +26,9 @@ module Gitlab
##
# File location of the file
# legacy_path: File.join(model.created_at.utc.strftime('%Y_%m'), model.project_id.to_s, model.id.to_s)
# current_path: File.join(disk_hash[0..1], disk_hash[2..3], disk_hash, creation_date, model.job_id.to_s, model.id.to_s)
# hashed_path: File.join(disk_hash[0..1], disk_hash[2..3], disk_hash, creation_date, model.job_id.to_s, model.id.to_s)
enum file_location: {
current_path: nil,
hashed_path: nil,
legacy_path: 1
}
end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment