diff --git a/app/views/projects/blob/_image.html.haml b/app/views/projects/blob/_image.html.haml index 6955b7086b99f304eaf64509255a33a39cb7904c..113dba5d83264714895175c54cf9088364d93258 100644 --- a/app/views/projects/blob/_image.html.haml +++ b/app/views/projects/blob/_image.html.haml @@ -1,8 +1,9 @@ .file-content.image_file - if blob_svg?(blob) - - # We need to scrub SVG but we cannot do so in the RawController + - # We need to scrub SVG but we cannot do so in the RawController: it would + - # be wrong/strange if RawController modified the data. - blob.load_all_data!(@repository) - blob = sanitize_svg(blob) - %img{ src: "data:#{blob.mime_type};base64,#{Base64.encode64(blob.data)}"} + %img{src: "data:#{blob.mime_type};base64,#{Base64.encode64(blob.data)}"} - else - %img{ src: namespace_project_raw_path(@project.namespace, @project, @id)} + %img{src: namespace_project_raw_path(@project.namespace, @project, @id)} diff --git a/app/views/projects/diffs/_image.html.haml b/app/views/projects/diffs/_image.html.haml index e3699c6cab41705bc5104423b0de0b3665940136..752e92e2e6bd4c97aeaa40b67b61b70afe7dd677 100644 --- a/app/views/projects/diffs/_image.html.haml +++ b/app/views/projects/diffs/_image.html.haml @@ -5,7 +5,7 @@ .image %span.wrap .frame{class: image_diff_class(diff)} - %img{src: file_raw_path} + %img{src: diff.deleted_file ? old_file_raw_path : file_raw_path} %p.image-info= "#{number_to_human_size file.size}" - else .image