summaryrefslogtreecommitdiff
path: root/app/uploaders
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 /app/uploaders
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 'app/uploaders')
-rw-r--r--app/uploaders/uploader_helper.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/uploaders/uploader_helper.rb b/app/uploaders/uploader_helper.rb
index 703f7820913..b10ad71d052 100644
--- a/app/uploaders/uploader_helper.rb
+++ b/app/uploaders/uploader_helper.rb
@@ -3,8 +3,8 @@ module UploaderHelper
IMAGE_EXT = %w[png jpg jpeg gif bmp tiff]
# We recommend using the .mp4 format over .mov. Videos in .mov format can
# still be used but you really need to make sure they are served with the
- # proper MIME type video/mp4 and not video/quicktime or your videos won’t play
- # on IE ≥ 9.
+ # proper MIME type video/mp4 and not video/quicktime or your videos won't play
+ # on IE >= 9.
# http://archive.sublimevideo.info/20150912/docs.sublimevideo.net/troubleshooting.html
VIDEO_EXT = %w[mp4 m4v mov webm ogv]
@@ -21,6 +21,8 @@ module UploaderHelper
end
def extension_match?(extensions)
+ return false unless file
+
extension =
if file.respond_to?(:extension)
file.extension