diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-08-23 17:24:01 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-11-21 14:27:53 +0300 |
| commit | 384fc3be8c4a6c41a90475b8ec92a6723528acac (patch) | |
| tree | 942189969fc596370dab456e5be6845de60d84c1 | |
| parent | 3690eb94ca9e1660278b92a585ec3a91b662332f (diff) | |
Fix BlobBasicEntity when used to render a tree blob
| -rw-r--r-- | app/serializers/blob_basic_entity.rb | 5 | ||||
| -rw-r--r-- | 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 |