diff options
| author | James Lopez <james@jameslopez.es> | 2016-02-18 11:12:26 +0100 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-02-18 11:12:26 +0100 |
| commit | c9be4d65f2d3f6695e99cc7f99ad889b48780e3b (patch) | |
| tree | fda0d78e73795cb8da353e52344b04787cca3802 /app/views/projects/blob/_blob.html.haml | |
| parent | 8006d025139a506f732137209c85935353bae276 (diff) | |
| parent | 8b918267c7477f7e1a36b4f3cc12c9e244204cb9 (diff) | |
| download | gitlab-ce-c9be4d65f2d3f6695e99cc7f99ad889b48780e3b.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/slack-notifications-on-ci
# Conflicts:
# .gitlab-ci.yml
Diffstat (limited to 'app/views/projects/blob/_blob.html.haml')
| -rw-r--r-- | app/views/projects/blob/_blob.html.haml | 2 |
1 files changed, 1 insertions, 1 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? |