diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-09 13:02:28 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-09 13:02:28 +0000 |
| commit | 1f9d688ffcc091d2b7167e6e51a070c1271823ce (patch) | |
| tree | c12e75ff6ae2d514df456ba29113033d701ea01a | |
| parent | e384a14cc84d399c9e17e2fe78ccc6a06fd275ff (diff) | |
| parent | c6acc7ed437e4dfef3fed9346718e67cd5905547 (diff) | |
| download | gitlab-ce-1f9d688ffcc091d2b7167e6e51a070c1271823ce.tar.gz | |
Merge branch 'render-svg-in-diffs-and-notes' into 'master'
Render SVG images in notes
Closes #24937
See merge request !7747
| -rw-r--r-- | app/uploaders/uploader_helper.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/render-svg-in-diffs-and-notes.yml | 4 |
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 |