summaryrefslogtreecommitdiff
path: root/app/controllers/concerns/renders_blob.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-08-03 14:29:35 +0200
committerDouwe Maan <douwe@selenight.nl>2017-08-03 14:29:35 +0200
commitf711b2df8bf02ed10716cdd6292002132413e3d8 (patch)
tree61855bf762b13a6f85aa0ff676f4d2e115ed1329 /app/controllers/concerns/renders_blob.rb
parent2197ee02e95ade455785cc1769bf3a40a082a799 (diff)
downloadgitlab-ce-f711b2df8bf02ed10716cdd6292002132413e3d8.tar.gz
Clean up some backend
Diffstat (limited to 'app/controllers/concerns/renders_blob.rb')
-rw-r--r--app/controllers/concerns/renders_blob.rb34
1 files changed, 13 insertions, 21 deletions
diff --git a/app/controllers/concerns/renders_blob.rb b/app/controllers/concerns/renders_blob.rb
index 5a1b1d9f929..ba7adcfea86 100644
--- a/app/controllers/concerns/renders_blob.rb
+++ b/app/controllers/concerns/renders_blob.rb
@@ -1,7 +1,7 @@
module RendersBlob
extend ActiveSupport::Concern
- def render_blob_json(blob)
+ def blob_json(blob)
viewer =
case params[:viewer]
when 'rich'
@@ -11,27 +11,19 @@ module RendersBlob
else
blob.simple_viewer
end
-
- return render_404 unless viewer
- if blob.binary?
- render json: {
- binary: true,
- mime_type: blob.mime_type,
- name: blob.name,
- extension: blob.extension,
- size: blob.raw_size
- }
- else
- render json: {
- html: view_to_html_string("projects/blob/_viewer", viewer: viewer, load_async: false),
- plain: blob.data,
- name: blob.name,
- extension: blob.extension,
- size: blob.raw_size,
- mime_type: blob.mime_type
- }
- end
+ return unless viewer
+
+ {
+ html: view_to_html_string("projects/blob/_viewer", viewer: viewer, load_async: false)
+ }
+ end
+
+ def render_blob_json(blob)
+ json = blob_json(blob)
+ return render_404 unless json
+
+ render json: json
end
def conditionally_expand_blob(blob)