From 6b7e9c7655e4ffc74de90f01a0850a230b10a03c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Coutable?= Date: Tue, 12 Jul 2016 19:28:39 +0200 Subject: Remove VideoJS and clean the integration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Handle videos in: - MD preview in notes: commit, issue/MR, MR diff - New notes in: commit, issue/MR, MR diff - Persisted notes in: commit, issue/MR, MR diff Signed-off-by: Rémy Coutable --- doc/markdown/img/video.mp4 | Bin 0 -> 383631 bytes doc/markdown/markdown.md | 15 +++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 doc/markdown/img/video.mp4 (limited to 'doc/markdown') diff --git a/doc/markdown/img/video.mp4 b/doc/markdown/img/video.mp4 new file mode 100644 index 00000000000..1fc478842f5 Binary files /dev/null and b/doc/markdown/img/video.mp4 differ diff --git a/doc/markdown/markdown.md b/doc/markdown/markdown.md index fb2dd582754..d407eec2494 100644 --- a/doc/markdown/markdown.md +++ b/doc/markdown/markdown.md @@ -13,6 +13,7 @@ * [Emoji](#emoji) * [Special GitLab references](#special-gitlab-references) * [Task Lists](#task-lists) +* [Videos](#videos) **[Standard Markdown](#standard-markdown)** @@ -281,6 +282,20 @@ You can add task lists to issues, merge requests and comments. To create a task Task lists can only be created in descriptions, not in titles. Task item state can be managed by editing the description's Markdown or by toggling the rendered check boxes. +## Videos + +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`. + + Here's a sample video: + + ![Sample Video](img/video.mp4) + +Here's a sample video: + +![Sample Video](img/video.mp4) + # Standard Markdown ## Headers -- cgit v1.2.3