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

2 files changed, 24 insertions, 8 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
diff --git a/app/uploaders/uploader_helper.rb b/app/uploaders/uploader_helper.rb
index 5ef440f3367..6d510fe7dde 100644
--- a/app/uploaders/uploader_helper.rb
+++ b/app/uploaders/uploader_helper.rb
@@ -1,16 +1,32 @@
 # Extra methods for uploader
 module UploaderHelper
+  IMAGE_EXT = %w(png jpg jpeg gif bmp tiff)
+  VIDEO_EXT = %w(mov mp4 ogg webm flv)
+
   def image?
-    img_ext = %w(png jpg jpeg gif bmp tiff)
+    extension_match?(IMAGE_EXT)
+  rescue
+    false
+  end
+
+  def video?
+    extension_match?(VIDEO_EXT)
+  rescue
+    false
+  end
+
+  def image_or_video?
+    image? || video?
+  end
+
+  def extension_match?(extensions)
     if file.respond_to?(:extension)
-      img_ext.include?(file.extension.downcase)
+      extensions.include?(file.extension.downcase)
     else
       # Not all CarrierWave storages respond to :extension
       ext = file.path.split('.').last.downcase
-      img_ext.include?(ext)
+      extensions.include?(ext)
     end
-  rescue
-    false
   end
 
   def file_storage?