diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-23 21:06:14 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-23 21:06:14 +0300 |
| commit | c792263edfaf826c58f4aa41d26904464a17a3e7 (patch) | |
| tree | b57ae96c9eeaf0a1432a29f7f50f2fce9529818d /app/models/diff_viewer | |
| parent | 6f9edd1a4c4942d3d13ec54793cfae56164b1a0a (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/diff_viewer')
| -rw-r--r-- | app/models/diff_viewer/image.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/diff_viewer/image.rb b/app/models/diff_viewer/image.rb index 350bef1d42a..cfda0058d81 100644 --- a/app/models/diff_viewer/image.rb +++ b/app/models/diff_viewer/image.rb @@ -6,7 +6,7 @@ module DiffViewer 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') |