Merge branch 'dm-video-viewer' into 'master'

app/assets/stylesheets/framework/files.scss

@@ -61,11 +61,13 @@
   .file-content {
     background: $white-light;
 
-    &.image_file {
+    &.image_file,
+    &.video {
       background: $file-image-bg;
       text-align: center;
 
-      img {
+      img,
+      video {
         padding: 20px;
         max-width: 80%;
       }

app/models/blob.rb

@@ -27,6 +27,8 @@ class Blob < SimpleDelegator
     BlobViewer::Image,
     BlobViewer::Sketch,
 
+    BlobViewer::Video,
+    
     BlobViewer::PDF,
 
     BlobViewer::BinarySTL,

app/models/blob_viewer/video.rb

+module BlobViewer
+  class Video < Base
+    include Rich
+    include ClientSide
+
+    self.partial_name = 'video'
+    self.extensions = UploaderHelper::VIDEO_EXT
+    self.binary = true
+    self.switcher_icon = 'film'
+    self.switcher_title = 'video'
+  end
+end

app/views/projects/blob/viewers/_video.html.haml

+.file-content.video
+  %video{ src: blob_raw_url, controls: true, data: { setup: '{}' } }

changelogs/unreleased/dm-video-viewer.yml

+---
+title: Display video blobs in-line like images
+merge_request:
+author: