diff options
author | Jacob Schatz <jschatz1@gmail.com> | 2017-06-30 23:07:00 -0400 |
---|---|---|
committer | Jacob Schatz <jschatz1@gmail.com> | 2017-06-30 23:07:00 -0400 |
commit | 78db68ab776e944261187d87215a8d61df7185b0 (patch) | |
tree | 9d8eb7a5fad71714f8a28c9a2ef7dba95a168229 /app/controllers/concerns/renders_blob.rb | |
parent | 7869cbaa7be6360c895b443fff19e1241bf8ed24 (diff) | |
download | gitlab-ce-78db68ab776e944261187d87215a8d61df7185b0.tar.gz |
Show PNG's and setup nice framework for showing any binary fine.
Diffstat (limited to 'app/controllers/concerns/renders_blob.rb')
-rw-r--r-- | app/controllers/concerns/renders_blob.rb | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/app/controllers/concerns/renders_blob.rb b/app/controllers/concerns/renders_blob.rb index 46a3a64b3ad..591cfcb184b 100644 --- a/app/controllers/concerns/renders_blob.rb +++ b/app/controllers/concerns/renders_blob.rb @@ -13,13 +13,22 @@ module RendersBlob end return render_404 unless viewer puts blob - render json: { - html: view_to_html_string("projects/blob/_viewer", viewer: viewer, load_async: false), - plain: blob.data, - name: blob.name, - size: blob.size, - mime_type: blob.mime_type - } + if blob.binary? + render json: { + binary: true, + mime_type: blob.mime_type, + name: blob.name, + size: blob.size + } + else + render json: { + html: view_to_html_string("projects/blob/_viewer", viewer: viewer, load_async: false), + plain: blob.data, + name: blob.name, + size: blob.size, + mime_type: blob.mime_type + } + end end def conditionally_expand_blob(blob) |