summaryrefslogtreecommitdiff
path: root/app/controllers/concerns
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2017-06-15 21:10:49 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2017-06-15 21:10:49 +0300
commit4b962efc010c716139112b07417512fb2a930c25 (patch)
tree416ee995397d4dcdaf3e78764230df9601f0e12b /app/controllers/concerns
parent2ae9c890e7037ec13b1882fda9ab90fc73f04fcc (diff)
downloadgitlab-ce-4b962efc010c716139112b07417512fb2a930c25.tar.gz
Add extra data for RenderBlob json
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/controllers/concerns')
-rw-r--r--app/controllers/concerns/renders_blob.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/concerns/renders_blob.rb b/app/controllers/concerns/renders_blob.rb
index 1d37e4cb3bd..2c50957b46a 100644
--- a/app/controllers/concerns/renders_blob.rb
+++ b/app/controllers/concerns/renders_blob.rb
@@ -14,7 +14,11 @@ module RendersBlob
return render_404 unless viewer
render json: {
- html: view_to_html_string("projects/blob/_viewer", viewer: viewer, load_async: false)
+ 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