summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2018-01-30 01:56:12 +0900
committerShinya Maeda <shinya@gitlab.com>2018-02-06 15:50:08 +0900
commitc9ed3b2d4d208b7452fc2e057f11d28356c08887 (patch)
tree19c2ae6b63f4a901a98346f51a1bff85739672f0 /app
parentedc936cde2730bb7c417343c582f2b8cf5b571c3 (diff)
downloadgitlab-ce-c9ed3b2d4d208b7452fc2e057f11d28356c08887.tar.gz
Add essential tests
Diffstat (limited to 'app')
-rw-r--r--app/uploaders/job_artifact_uploader.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/app/uploaders/job_artifact_uploader.rb b/app/uploaders/job_artifact_uploader.rb
index 57678dae9ca..bc535e9fb1b 100644
--- a/app/uploaders/job_artifact_uploader.rb
+++ b/app/uploaders/job_artifact_uploader.rb
@@ -16,7 +16,13 @@ class JobArtifactUploader < GitlabUploader
def open
raise 'Only File System is supported' unless file_storage?
- File.open(path, "rb")
+ File.open(path, "rb") if path
+ end
+
+ def filename
+ return 'trace.log' if model.trace?
+
+ super
end
private