summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-07-12 19:28:39 +0200
committerRémy Coutable <remy@rymai.me>2016-07-20 11:36:42 +0200
commit6b7e9c7655e4ffc74de90f01a0850a230b10a03c (patch)
treeda865eb7dff81588d426907afcc74d6a072fe3fa /doc
parent98e540532cc2706e4cdc027bd2acb8406e954ddc (diff)
downloadgitlab-ce-6b7e9c7655e4ffc74de90f01a0850a230b10a03c.tar.gz
Remove VideoJS and clean the integration
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 <remy@rymai.me>
Diffstat (limited to 'doc')
-rw-r--r--doc/markdown/img/video.mp4bin0 -> 383631 bytes
-rw-r--r--doc/markdown/markdown.md15
2 files changed, 15 insertions, 0 deletions
diff --git a/doc/markdown/img/video.mp4 b/doc/markdown/img/video.mp4
new file mode 100644
index 00000000000..1fc478842f5
--- /dev/null
+++ b/doc/markdown/img/video.mp4
Binary files 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