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:
authorMicaël Bergeron <mbergeron@gitlab.com>2018-03-02 21:21:03 +0300
committerMicaël Bergeron <mbergeron@gitlab.com>2018-03-02 21:21:03 +0300
commit4484587ef8c9bf63c60359a0980dda95e854b744 (patch)
treea917f3d9336e389e485fdab72cc5a8a5ad5fd3af /app/uploaders/job_artifact_uploader.rb
parent0d458b96e8349a50877ebd55932bf806e93caa21 (diff)
another round of EE code removal
Diffstat (limited to 'app/uploaders/job_artifact_uploader.rb')
-rw-r--r--app/uploaders/job_artifact_uploader.rb8
1 files changed, 5 insertions, 3 deletions
diff --git a/app/uploaders/job_artifact_uploader.rb b/app/uploaders/job_artifact_uploader.rb
index 06842a58571..ef0f8acefd6 100644
--- a/app/uploaders/job_artifact_uploader.rb
+++ b/app/uploaders/job_artifact_uploader.rb
@@ -15,9 +15,11 @@ class JobArtifactUploader < GitlabUploader
end
def open
- raise 'Only File System is supported' unless file_storage?
-
- File.open(path, "rb") if path
+ if file_storage?
+ File.open(path, "rb") if path
+ else
+ ::Gitlab::Ci::Trace::HttpIO.new(url, size) if url
+ end
end
private