summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Guedes <andrebsguedes@gmail.com>2016-11-29 14:51:45 -0200
committerAndre Guedes <andrebsguedes@gmail.com>2016-12-08 00:29:43 -0200
commitc6acc7ed437e4dfef3fed9346718e67cd5905547 (patch)
tree0fadf3e3c5285343f2cfb837d5aa0fcc25ddd1c4
parent50a784482e997cc039015e24b37d3f8a01a9cd3e (diff)
downloadgitlab-ce-c6acc7ed437e4dfef3fed9346718e67cd5905547.tar.gz
Render SVG as images in notes
-rw-r--r--app/uploaders/uploader_helper.rb2
-rw-r--r--changelogs/unreleased/render-svg-in-diffs-and-notes.yml4
2 files changed, 5 insertions, 1 deletions
diff --git a/app/uploaders/uploader_helper.rb b/app/uploaders/uploader_helper.rb
index b10ad71d052..fbaea2744a3 100644
--- a/app/uploaders/uploader_helper.rb
+++ b/app/uploaders/uploader_helper.rb
@@ -1,6 +1,6 @@
# 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
diff --git a/changelogs/unreleased/render-svg-in-diffs-and-notes.yml b/changelogs/unreleased/render-svg-in-diffs-and-notes.yml
new file mode 100644
index 00000000000..827b0dbb1d3
--- /dev/null
+++ b/changelogs/unreleased/render-svg-in-diffs-and-notes.yml
@@ -0,0 +1,4 @@
+---
+title: Render SVG images in diffs and notes
+merge_request: 7747
+author: andrebsguedes