Merge branch 'render-svg-in-diffs-and-notes' into 'master'

Render SVG images in notes Closes #24937 See merge request !7747

Merge branch 'render-svg-in-diffs-and-notes' into 'master'
1f9d688f · Sean McGivern · e384a14c · c6acc7ed · 1f9d688f · 1f9d688f
Commit 1f9d688f authored Dec 09, 2016 by Sean McGivern
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

uploader_helper.rb app/uploaders/uploader_helper.rb +1 -1

render-svg-in-diffs-and-notes.yml changelogs/unreleased/render-svg-in-diffs-and-notes.yml +4 -0

No files found.
--- a/app/uploaders/uploader_helper.rb
+++ b/app/uploaders/uploader_helper.rb
 # Extra methods for uploader
 module UploaderHelper
-  IMAGE_EXT = %w[png jpg jpeg gif bmp tiff]
+  IMAGE_EXT = %w[png jpg jpeg gif bmp tiff svg]
  # 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

--- a/changelogs/unreleased/render-svg-in-diffs-and-notes.yml
+++ b/changelogs/unreleased/render-svg-in-diffs-and-notes.yml
+---
+title: Render SVG images in diffs and notes
+merge_request: 7747
+author: andrebsguedes