Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2017-11-23 18:57:27 +0300
committerKamil Trzcinski <ayufan@ayufan.eu>2017-12-03 14:04:49 +0300
commit871de0f18581bb03fed5c0d800f8183598a0195f (patch)
tree5b5ac2aadd2a7d58f5e4c845ee85141ee96241a3 /app/uploaders/job_artifact_uploader.rb
parente2242cdf75d2734f78f694ab3191fcbb31947a6f (diff)
Rename artifacts_* to legacy_artifacts_*
Diffstat (limited to 'app/uploaders/job_artifact_uploader.rb')
-rw-r--r--app/uploaders/job_artifact_uploader.rb18
1 files changed, 5 insertions, 13 deletions
diff --git a/app/uploaders/job_artifact_uploader.rb b/app/uploaders/job_artifact_uploader.rb
index 8a5200504fc..d54411e198f 100644
--- a/app/uploaders/job_artifact_uploader.rb
+++ b/app/uploaders/job_artifact_uploader.rb
@@ -9,30 +9,22 @@ class JobArtifactUploader < GitlabUploader
File.join(self.local_artifacts_store, 'tmp/uploads/')
end
- def initialize(artifact, _field)
- @artifact = artifact
- end
-
def size
- return super if @artifact.size.nil?
-
- @artifact.size
- end
+ return super if model.size.nil?
- def store_dir
- File.join(self.class.local_artifacts_store, default_path)
+ model.size
end
private
def default_path
- creation_date = @artifact.created_at.utc.strftime('%Y_%m_%d')
+ creation_date = model.created_at.utc.strftime('%Y_%m_%d')
File.join(disk_hash[0..1], disk_hash[2..3], disk_hash,
- creation_date, @artifact.job_id.to_s, @artifact.id.to_s)
+ creation_date, model.job_id.to_s, model.id.to_s)
end
def disk_hash
- @disk_hash ||= Digest::SHA2.hexdigest(@artifact.project_id.to_s)
+ @disk_hash ||= Digest::SHA2.hexdigest(model.project_id.to_s)
end
end