diff options
author | Eric Hayes <eric@erichayes.net> | 2016-04-03 08:00:06 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-07-19 19:51:09 +0300 |
commit | c266c7fa18848586cd6ee903cc4c4d4f9049100e (patch) | |
tree | 8fa8d0b2dca828bec6af0ad49855cbb4e69a9e30 /app/uploaders/file_uploader.rb | |
parent | 81e57e783e8882de21d27d9191c09404ed7faca3 (diff) |
First support of videos in issues, MRs and notes
* Registered video MIME types
* Currently supporting browser-supported formats with extensions that match the mime type
Diffstat (limited to 'app/uploaders/file_uploader.rb')
-rw-r--r-- | app/uploaders/file_uploader.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/uploaders/file_uploader.rb b/app/uploaders/file_uploader.rb index 1af9e9b0edb..80284fa294a 100644 --- a/app/uploaders/file_uploader.rb +++ b/app/uploaders/file_uploader.rb @@ -33,16 +33,16 @@ class FileUploader < CarrierWave::Uploader::Base end def to_h - filename = image? ? self.file.basename : self.file.filename + filename = image_or_video? ? self.file.basename : self.file.filename escaped_filename = filename.gsub("]", "\\]") markdown = "[#{escaped_filename}](#{self.secure_url})" - markdown.prepend("!") if image? + markdown.prepend("!") if image_or_video? { alt: filename, url: self.secure_url, - is_image: image?, + is_image: image_or_video?, markdown: markdown } end |