From 999118f0ec6edabc9e13c089381ad664970a080a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= Date: Tue, 6 Feb 2018 14:18:32 +0000 Subject: Merge branch 'feature/sm/artifacts-trace-ee' into 'master' EE: Trace as artifacts (FileStorage and ObjectStorage) Closes #4171 See merge request gitlab-org/gitlab-ee!4258 --- app/uploaders/job_artifact_uploader.rb | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'app/uploaders/job_artifact_uploader.rb') diff --git a/app/uploaders/job_artifact_uploader.rb b/app/uploaders/job_artifact_uploader.rb index 3ad3e6ea32b..d80221144b4 100644 --- a/app/uploaders/job_artifact_uploader.rb +++ b/app/uploaders/job_artifact_uploader.rb @@ -1,4 +1,5 @@ class JobArtifactUploader < GitlabUploader + prepend EE::JobArtifactUploader extend Workhorse::UploadPath include ObjectStorage::Concern @@ -14,6 +15,12 @@ class JobArtifactUploader < GitlabUploader dynamic_segment end + def open + raise 'Only File System is supported' unless file_storage? + + File.open(path, "rb") if path + end + private def dynamic_segment -- cgit v1.2.1