diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-06 14:18:32 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-28 20:59:25 +0100 |
| commit | 999118f0ec6edabc9e13c089381ad664970a080a (patch) | |
| tree | 4201e2944efb5379c9355999fc3750d0b0710566 /app/uploaders/job_artifact_uploader.rb | |
| parent | b14c484bb1d174c7c355de2258be1a4414b2cf78 (diff) | |
| download | gitlab-ce-999118f0ec6edabc9e13c089381ad664970a080a.tar.gz | |
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
Diffstat (limited to 'app/uploaders/job_artifact_uploader.rb')
| -rw-r--r-- | app/uploaders/job_artifact_uploader.rb | 7 |
1 files changed, 7 insertions, 0 deletions
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 |