diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-07-21 08:55:19 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-07-21 08:56:57 +0200 |
| commit | ab86d27d3390b0388bbd92f123adf71321faa492 (patch) | |
| tree | c925c4435314f147c6b8d781b881a06defe2ce02 | |
| parent | 62bcbfc820dfee8e680ff3cfa220ef0d988ed9f6 (diff) | |
| download | gitlab-ce-4142-show-inline-video.tar.gz | |
Don't allow `.ogg` as a valid video extension4142-show-inline-video
`.ogg` is for music files.
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | config/initializers/mime_types.rb | 2 | ||||
| -rw-r--r-- | doc/markdown/markdown.md | 2 |
2 files changed, 2 insertions, 2 deletions
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 diff --git a/doc/markdown/markdown.md b/doc/markdown/markdown.md index d407eec2494..2bbe4b2a36e 100644 --- a/doc/markdown/markdown.md +++ b/doc/markdown/markdown.md @@ -286,7 +286,7 @@ Task lists can only be created in descriptions, not in titles. Task item state c Image tags with a video extension are automatically converted to a video player. -The valid video extensions are `.mp4`, `.m4v`, `.mov`, `.webm`, `.ogv`, and `.ogg`. +The valid video extensions are `.mp4`, `.m4v`, `.mov`, `.webm`, and `.ogv`. Here's a sample video: |