diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-23 18:06:14 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-23 18:06:14 +0000 |
| commit | c792263edfaf826c58f4aa41d26904464a17a3e7 (patch) | |
| tree | b57ae96c9eeaf0a1432a29f7f50f2fce9529818d /app/models/blob_viewer | |
| parent | 6f9edd1a4c4942d3d13ec54793cfae56164b1a0a (diff) | |
| download | gitlab-ce-c792263edfaf826c58f4aa41d26904464a17a3e7.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/blob_viewer')
| -rw-r--r-- | app/models/blob_viewer/image.rb | 2 | ||||
| -rw-r--r-- | app/models/blob_viewer/video.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/blob_viewer/image.rb b/app/models/blob_viewer/image.rb index 56e27839fca..cbebef46c60 100644 --- a/app/models/blob_viewer/image.rb +++ b/app/models/blob_viewer/image.rb @@ -6,7 +6,7 @@ module BlobViewer include ClientSide self.partial_name = 'image' - self.extensions = UploaderHelper::IMAGE_EXT + self.extensions = UploaderHelper::SAFE_IMAGE_EXT self.binary = true self.switcher_icon = 'picture-o' self.switcher_title = 'image' diff --git a/app/models/blob_viewer/video.rb b/app/models/blob_viewer/video.rb index 48bb2a13518..d35b8e7342e 100644 --- a/app/models/blob_viewer/video.rb +++ b/app/models/blob_viewer/video.rb @@ -6,7 +6,7 @@ module BlobViewer include ClientSide self.partial_name = 'video' - self.extensions = UploaderHelper::VIDEO_EXT + self.extensions = UploaderHelper::SAFE_VIDEO_EXT self.binary = true self.switcher_icon = 'film' self.switcher_title = 'video' |