From c266c7fa18848586cd6ee903cc4c4d4f9049100e Mon Sep 17 00:00:00 2001 From: Eric Hayes Date: Sat, 2 Apr 2016 22:00:06 -0700 Subject: 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 --- config/initializers/mime_types.rb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb index ca58ae92d1b..4c6de622f17 100644 --- a/config/initializers/mime_types.rb +++ b/config/initializers/mime_types.rb @@ -6,5 +6,11 @@ Mime::Type.register_alias "text/plain", :diff Mime::Type.register_alias "text/plain", :patch -Mime::Type.register_alias 'text/html', :markdown -Mime::Type.register_alias 'text/html', :md +Mime::Type.register_alias "text/html", :markdown +Mime::Type.register_alias "text/html", :md + +Mime::Type.register "video/webm", :webm +Mime::Type.register "video/ogg", :ogg +Mime::Type.register "video/ogg", :ogv +Mime::Type.register "video/mp4", :mp4 +Mime::Type.register "video/mp4", :m4v -- cgit v1.2.1 From 29ea8d09e05d749f0b6a784311aea942f7d2d0f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Coutable?= Date: Fri, 8 Jul 2016 18:55:49 +0200 Subject: Remove duplication, useless rescue, and avoid using ActionView MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rémy Coutable --- config/initializers/mime_types.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'config') diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb index 4c6de622f17..cd449b65818 100644 --- a/config/initializers/mime_types.rb +++ b/config/initializers/mime_types.rb @@ -9,8 +9,6 @@ Mime::Type.register_alias "text/plain", :patch Mime::Type.register_alias "text/html", :markdown Mime::Type.register_alias "text/html", :md +Mime::Type.register "video/mp4", :mp4, [], [:m4v, :mov] Mime::Type.register "video/webm", :webm -Mime::Type.register "video/ogg", :ogg -Mime::Type.register "video/ogg", :ogv -Mime::Type.register "video/mp4", :mp4 -Mime::Type.register "video/mp4", :m4v +Mime::Type.register "video/ogg", :ogv, [], [:ogg] -- cgit v1.2.1 From ab86d27d3390b0388bbd92f123adf71321faa492 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Coutable?= Date: Thu, 21 Jul 2016 08:55:19 +0200 Subject: Don't allow `.ogg` as a valid video extension MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `.ogg` is for music files. Signed-off-by: Rémy Coutable --- config/initializers/mime_types.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb index cd449b65818..3e553120205 100644 --- a/config/initializers/mime_types.rb +++ b/config/initializers/mime_types.rb @@ -11,4 +11,4 @@ Mime::Type.register_alias "text/html", :md Mime::Type.register "video/mp4", :mp4, [], [:m4v, :mov] Mime::Type.register "video/webm", :webm -Mime::Type.register "video/ogg", :ogv, [], [:ogg] +Mime::Type.register "video/ogg", :ogv -- cgit v1.2.1