summaryrefslogtreecommitdiff
path: root/app/uploaders
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2017-06-12 23:42:11 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2017-06-13 00:37:12 +0200
commit05683f313b40e1c37fbfbb04bd4d0e368dc5b39a (patch)
tree2ab5d454d1509ac68890ecf65c39fa61279ee389 /app/uploaders
parent652eb0118b3cf87f96dfbaacf5802d974303e427 (diff)
downloadgitlab-ce-05683f313b40e1c37fbfbb04bd4d0e368dc5b39a.tar.gz
Fix filename method of GitlabUploader to return always real filenamefix-filename-of-artifact-uploader
Diffstat (limited to 'app/uploaders')
-rw-r--r--app/uploaders/gitlab_uploader.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/uploaders/gitlab_uploader.rb b/app/uploaders/gitlab_uploader.rb
index 136ec6cc6af..0da7a025591 100644
--- a/app/uploaders/gitlab_uploader.rb
+++ b/app/uploaders/gitlab_uploader.rb
@@ -61,6 +61,10 @@ class GitlabUploader < CarrierWave::Uploader::Base
CarrierWave.tmp_path
end
+ def filename
+ super || file&.filename
+ end
+
private
# To prevent files from moving across filesystems, override the default