summaryrefslogtreecommitdiff
path: root/app/uploaders
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-01-08 17:38:53 +0100
committerDouwe Maan <douwe@gitlab.com>2016-01-08 17:38:53 +0100
commit0614793b38db4711053cbcb4fa80d9c8cc492eec (patch)
tree528e7b413ea84dd45bc2c02e9820c6d18e3f2d38 /app/uploaders
parent1e927d39b4bf6d1177dee0dd4a6c60bf270db3f2 (diff)
downloadgitlab-ce-0614793b38db4711053cbcb4fa80d9c8cc492eec.tar.gz
DRY up upload and download servicesapi-project-upload
Diffstat (limited to 'app/uploaders')
-rw-r--r--app/uploaders/file_uploader.rb15
1 files changed, 15 insertions, 0 deletions
diff --git a/app/uploaders/file_uploader.rb b/app/uploaders/file_uploader.rb
index ac920119a85..86d24469e05 100644
--- a/app/uploaders/file_uploader.rb
+++ b/app/uploaders/file_uploader.rb
@@ -30,4 +30,19 @@ class FileUploader < CarrierWave::Uploader::Base
def secure_url
File.join("/uploads", @secret, file.filename)
end
+
+ def to_h
+ filename = image? ? self.file.basename : self.file.filename
+ escaped_filename = filename.gsub("]", "\\]")
+
+ markdown = "[#{escaped_filename}](#{self.secure_url})"
+ markdown.prepend("!") if image?
+
+ {
+ alt: filename,
+ url: self.secure_url,
+ is_image: image?,
+ markdown: markdown
+ }
+ end
end