From 5f2ff6bf7288a9d28a0c28a7b02098944c402045 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Wed, 23 Aug 2017 16:24:01 +0200 Subject: Fix BlobBasicEntity when used to render a tree blob --- app/serializers/blob_basic_entity.rb | 5 +---- app/serializers/blob_entity.rb | 5 +++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/serializers/blob_basic_entity.rb b/app/serializers/blob_basic_entity.rb index 24c81c3bb6f..3a630bbcca1 100644 --- a/app/serializers/blob_basic_entity.rb +++ b/app/serializers/blob_basic_entity.rb @@ -1,10 +1,7 @@ class BlobBasicEntity < Grape::Entity include RequestAwareEntity - expose :id, :path, :name, :mode, :extension, :mime_type, :file_type - - expose :raw_size, as: :size - expose :raw_binary?, as: :binary + expose :id, :path, :name, :mode expose :last_commit do |blob| request.project.repository.last_commit_for_path(blob.commit_id, blob.path) diff --git a/app/serializers/blob_entity.rb b/app/serializers/blob_entity.rb index c9b87eea6c7..0930d6d3526 100644 --- a/app/serializers/blob_entity.rb +++ b/app/serializers/blob_entity.rb @@ -1,4 +1,9 @@ class BlobEntity < BlobBasicEntity + expose :extension, :mime_type, :file_type + + expose :raw_size, as: :size + expose :raw_binary?, as: :binary + expose :simple_viewer, :rich_viewer, :auxiliary_viewer, using: BlobViewerEntity expose :stored_externally?, as: :stored_externally -- cgit v1.2.1