Commit 1bc2ac33 authored by Robert Speicher's avatar Robert Speicher

Merge branch '17276-breakage-in-displaying-svg-in-the-same-repository' into 'master'

Resolve "Breakage in displaying SVG in the same repository"

See merge request gitlab-org/gitlab-ce!31352
parents 8374dd56 3b1da9be
---
title: Fix inline rendering of relative paths to SVGs from the current repository
merge_request: 31352
author:
type: fixed
......@@ -45,7 +45,7 @@ module Gitlab
end
def image?
['.png', '.jpg', '.jpeg', '.gif'].include?(extname.downcase)
['.png', '.jpg', '.jpeg', '.gif', '.svg'].include?(extname.downcase)
end
# Internal: Lookup mime type for extension.
......
......@@ -556,6 +556,7 @@ eos
it 'returns the URI type at the given path' do
expect(commit.uri_type('files/html')).to be(:tree)
expect(commit.uri_type('files/images/logo-black.png')).to be(:raw)
expect(commit.uri_type('files/images/wm.svg')).to be(:raw)
expect(project.commit('video').uri_type('files/videos/intro.mp4')).to be(:raw)
expect(commit.uri_type('files/js/application.js')).to be(:blob)
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment