diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-02-02 15:04:54 +0100 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-02-02 15:04:54 +0100 |
| commit | d3affe8bca5f5944c6819be1261cc4da7a2c9420 (patch) | |
| tree | 047472310ccd89fb43a84101a6441917c461ebf1 /app/views/projects | |
| parent | e08aa3df905f09f1c964fb056cba922a1d6eaa85 (diff) | |
| parent | 6cffcb05882b0d3c4a02f9acf21806e25ea09ec3 (diff) | |
| download | gitlab-ce-d3affe8bca5f5944c6819be1261cc4da7a2c9420.tar.gz | |
Merge remote-tracking branch 'origin/master' into lazy-blobslazy-blobs
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/blob/_blob.html.haml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/views/projects/blob/_blob.html.haml b/app/views/projects/blob/_blob.html.haml index 3d8d88834e2..2c5b8dc4356 100644 --- a/app/views/projects/blob/_blob.html.haml +++ b/app/views/projects/blob/_blob.html.haml @@ -35,7 +35,10 @@ - if blob.lfs_pointer? = render "download", blob: blob - elsif blob.text? - = render "text", blob: blob + - if blob_svg?(blob) + = render "image", blob: sanitize_svg(blob) + - else + = render "text", blob: blob - elsif blob.image? = render "image", blob: blob - else |