summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorEric Hayes <eric@erichayes.net>2016-04-02 22:00:06 -0700
committerRémy Coutable <remy@rymai.me>2016-07-19 18:51:09 +0200
commitc266c7fa18848586cd6ee903cc4c4d4f9049100e (patch)
tree8fa8d0b2dca828bec6af0ad49855cbb4e69a9e30 /config
parent81e57e783e8882de21d27d9191c09404ed7faca3 (diff)
downloadgitlab-ce-c266c7fa18848586cd6ee903cc4c4d4f9049100e.tar.gz
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 'config')
-rw-r--r--config/initializers/mime_types.rb10
1 files changed, 8 insertions, 2 deletions
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