diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-02-17 11:08:47 +0100 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-02-17 11:08:47 +0100 |
| commit | a87fe2a47220fafdf1eb322f253ea061fe907f95 (patch) | |
| tree | b9a2bc4457a78a7d0e29e6599e65f5b9565e51b2 | |
| parent | 016367c640bf10781e6a5cbabe138257b2a8242e (diff) | |
| download | gitlab-ce-image-diff.tar.gz | |
Fixes requested by Rémyimage-diff
| -rw-r--r-- | app/views/projects/blob/_image.html.haml | 7 | ||||
| -rw-r--r-- | app/views/projects/diffs/_image.html.haml | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/app/views/projects/blob/_image.html.haml b/app/views/projects/blob/_image.html.haml index 6955b7086b9..113dba5d832 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 e3699c6cab4..752e92e2e6b 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 |