Automatic merge of gitlab-org/gitlab-ce master

changelogs/unreleased/17276-breakage-in-displaying-svg-in-the-same-repository.yml

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

lib/gitlab/blob_helper.rb

@@ -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.

spec/models/commit_spec.rb

@@ -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