gitlab-org--gitlab-foss/app/controllers
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
..
admin Merge branch 'email-domain-blacklist' into 'master' 2016-07-20 20:26:00 +00:00
ci Enable Style/SpaceAfterColon Rubocop cops 2016-06-29 15:16:04 +02:00
concerns Refactor service settings view 2016-07-20 12:11:37 -03:00
dashboard Cache todos pending/done dashboard query counts 2016-07-12 18:57:52 +02:00
explore
groups Exclude requesters from Project#members, Group#members and User#members 2016-07-01 17:44:46 +02:00
import fix 404 error, redirect back with flash message 2016-07-07 15:34:45 +02:00
oauth Fix endless redirections when accessing user OAuth applications when they are disabled 2016-06-08 05:52:04 -07:00
profiles Load Javascript U2F library selectively. 2016-07-14 08:19:09 +05:30
projects Merge branch '4142-show-inline-video' into 'master' 2016-07-21 07:29:38 +00:00
sherlock
abuse_reports_controller.rb
application_controller.rb Load Javascript U2F library selectively. 2016-07-14 08:19:09 +05:30
autocomplete_controller.rb Fixed issue with move dropdown not being searchable 2016-06-15 08:53:11 +01:00
confirmations_controller.rb Enable Style/EmptyLines cop, remove redundant ones 2016-07-01 21:56:17 +02:00
dashboard_controller.rb Restrict starred projects to viewable ones 2016-05-10 18:13:52 +01:00
emojis_controller.rb
groups_controller.rb Allow to disable user request access to groups/projects 2016-07-20 14:38:21 +02:00
health_check_controller.rb Support token header for health check token, and general cleanup of the health_check feature. 2016-05-11 17:27:08 -07:00
help_controller.rb Remove VideoJS and clean the integration 2016-07-20 11:36:42 +02:00
invites_controller.rb Enable Style/EmptyLines cop, remove redundant ones 2016-07-01 21:56:17 +02:00
jwt_controller.rb Improve Gitlab::Auth method names 2016-06-10 14:51:16 +02:00
namespaces_controller.rb
notification_settings_controller.rb merge master into issue_3359_3 2016-06-29 11:04:18 -03:00
omniauth_callbacks_controller.rb Added tests for 2FA check on OAuth request 2016-07-04 11:00:34 -05:00
passwords_controller.rb
profiles_controller.rb
projects_controller.rb Allow to disable user request access to groups/projects 2016-07-20 14:38:21 +02:00
registrations_controller.rb current_user.confirmed_at.present? => current_user.confirmed? 2016-05-20 13:52:42 -04:00
root_controller.rb
search_controller.rb Updated based on feedback 2016-04-26 09:04:35 +01:00
sent_notifications_controller.rb
sessions_controller.rb Merge branch '18225-avoid-full-table-users-count' into 'master' 2016-06-15 15:12:56 +00:00
snippets_controller.rb user routings refactor 2016-05-08 15:27:33 +07:00
uploads_controller.rb
users_controller.rb Group the contributing calendar by day 2016-05-16 12:22:17 +01:00