kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Browse source 
Resolve "Breakage in displaying SVG in the same repository"

See merge request gitlab-org/gitlab-ce!31352
This commit is contained in:
Robert Speicher 2019-08-02 16:32:40 +00:00
commit 1bc2ac330e
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
changelogs/unreleased/17276-breakage-in-displaying-svg-in-the-same-repository.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Fix inline rendering of relative paths to SVGs from the current repository
merge_request: 31352
author:
type: fixed

2
lib/gitlab/blob_helper.rb
View file

@ -45,7 +45,7 @@ module Gitlab
end end
def image? def image?
['.png', '.jpg', '.jpeg', '.gif'].include?(extname.downcase) ['.png', '.jpg', '.jpeg', '.gif', '.svg'].include?(extname.downcase)
end end
# Internal: Lookup mime type for extension. # Internal: Lookup mime type for extension.

1
spec/models/commit_spec.rb
View file

@ -556,6 +556,7 @@ eos
it 'returns the URI type at the given path' do it 'returns the URI type at the given path' do
expect(commit.uri_type('files/html')).to be(:tree) 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/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(project.commit('video').uri_type('files/videos/intro.mp4')).to be(:raw)
expect(commit.uri_type('files/js/application.js')).to be(:blob) expect(commit.uri_type('files/js/application.js')).to be(:blob)
end end