diff options
author | Rémy Coutable <remy@rymai.me> | 2016-07-08 18:55:49 +0200 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-07-19 18:51:09 +0200 |
commit | 29ea8d09e05d749f0b6a784311aea942f7d2d0f1 (patch) | |
tree | 9326f19dc1a67b3345f2c128f0b1118760fdb094 /config | |
parent | 356b2d2bd782289b6130a22531523562514aa7f6 (diff) | |
download | gitlab-ce-29ea8d09e05d749f0b6a784311aea942f7d2d0f1.tar.gz |
Remove duplication, useless rescue, and avoid using ActionView
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'config')
-rw-r--r-- | config/initializers/mime_types.rb | 6 |
1 files changed, 2 insertions, 4 deletions
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] |