kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/spec/fixtures
History
Rémy Coutable ed19b9cc43 Merge branch '4142-show-inline-video' into 'master' 
Add support for inline videos in issue, MR and notes (on issue, commit, MR, and MR diff)

## What does this MR do?

It adds support for inline videos in issue, MR and notes (on issue, commit, MR, and MR diff). Most of the work was done by @hayesr in !3508 but a few improvements were still missing.

## Why was this MR needed?

To be able to play uploaded videos in GitLab!

## What are the relevant issue numbers?

Closes #4142.

## Screenshots

### Video players

![Screen_Shot_2016-07-19_at_18.44.09](/uploads/e85e531b455a41c3e66b26b356abaafd/Screen_Shot_2016-07-19_at_18.44.09.png)

-----

![Screen_Shot_2016-07-19_at_18.44.29](/uploads/05f52a812760210d1eae86a7f8fc48bc/Screen_Shot_2016-07-19_at_18.44.29.png)

-----

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- Tests
  - [x] Test `VideoLinkFilter`
  - [x] Test in `spec/features/markdown_spec.rb`
  - [x] Improve `spec/uploaders/file_uploader_spec.rb`
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5215
 		2016-07-21 07:29:38 +00:00
..
container_registry Show proper image ID on registry page 2016-06-21 13:08:10 +02:00
emails Improve and finish the fallback to the In-Reply-To and References header for the reply-by-email feature 2016-03-25 13:05:15 +01:00
GoogleCodeProjectHosting.json GoogleCode importer: Do not care about casing of image file extensions 2015-07-20 00:53:43 +02:00
banana_sample.gif Implements drag and drop upload in creating issues 2014-05-23 16:22:42 +08:00
blockquote_fence_after.md Add more comments to regex 2016-07-10 14:47:53 -05:00
blockquote_fence_before.md Add more comments to regex 2016-07-10 14:47:53 -05:00
ci_build_artifacts.zip Support only valid UTF-8 paths in build artifacts browser 2016-01-14 12:48:16 +01:00
ci_build_artifacts_metadata.gz Update build artifacts metadata fixture to 0.0.2 2016-01-18 19:58:16 +01:00
dk.png optimize png images losslessly using zopflipng 2016-06-29 19:22:15 +08:00
doc_sample.txt Add trailing newline to all text files. 2014-06-21 11:20:22 +02:00
domain_blacklist.txt Default to manual input for `domain_whitelist`, syntax fixes and added new tests. 2016-07-18 17:53:43 -05:00
logo_sample.svg Render sanitized SVG images 2016-02-01 18:25:32 +01:00
mail_room_disabled.yml Don't load all of GitLab in mail_room 2016-02-26 18:48:13 -08:00
mail_room_enabled.yml Don't load all of GitLab in mail_room 2016-02-26 18:48:13 -08:00
markdown.md.erb Remove VideoJS and clean the integration 2016-07-20 11:36:42 +02:00
parallel_diff_result.yml don't expect " encoding anymore 2016-07-14 10:08:16 -07:00
rails_sample.jpg Implements drag and drop upload in creating issues 2014-05-23 16:22:42 +08:00
sanitized.svg Update SVG sanitizer to conform to SVG 1.1 2016-05-06 23:20:24 -07:00
unsanitized.svg Update SVG sanitizer to conform to SVG 1.1 2016-05-06 23:20:24 -07:00
video_sample.mp4 First support of videos in issues, MRs and notes 2016-07-19 18:51:09 +02:00