diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-02-17 15:25:57 +0100 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-02-17 15:25:57 +0100 |
| commit | 64d8a38b54500e4c359f510c0ee15ab8fadc9f18 (patch) | |
| tree | e5d1dc907b79a3a25f4679307f5603fce197376b /app/views/projects/blob | |
| parent | b3bd7c1999a1b2a662c029a608bcf25d50e9ee82 (diff) | |
| parent | 28d42a33f3385b57660906d4ca35e96d56785d7e (diff) | |
| download | gitlab-ce-git-archive-refactor.tar.gz | |
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-archive-refactorgit-archive-refactor
Diffstat (limited to 'app/views/projects/blob')
| -rw-r--r-- | app/views/projects/blob/_blob.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/blob/_image.html.haml | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/app/views/projects/blob/_blob.html.haml b/app/views/projects/blob/_blob.html.haml index 2c5b8dc4356..f3bfe0a18b0 100644 --- a/app/views/projects/blob/_blob.html.haml +++ b/app/views/projects/blob/_blob.html.haml @@ -36,7 +36,7 @@ = render "download", blob: blob - elsif blob.text? - if blob_svg?(blob) - = render "image", blob: sanitize_svg(blob) + = render "image", blob: blob - else = render "text", blob: blob - elsif blob.image? diff --git a/app/views/projects/blob/_image.html.haml b/app/views/projects/blob/_image.html.haml index 51fa91b08e4..113dba5d832 100644 --- a/app/views/projects/blob/_image.html.haml +++ b/app/views/projects/blob/_image.html.haml @@ -1,2 +1,9 @@ .file-content.image_file - %img{ src: namespace_project_raw_path(@project.namespace, @project, @id)} + - if blob_svg?(blob) + - # 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)}"} + - else + %img{src: namespace_project_raw_path(@project.namespace, @project, @id)} |