diff options
author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-06-08 20:09:47 +0300 |
---|---|---|
committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-06-08 20:09:47 +0300 |
commit | 299a3a9aa0a91229f2767113145c3166ac642379 (patch) | |
tree | 82b690a72bd52c705d91424b97dbe8bb186e569f /app | |
parent | e9002222a0fc65e4e3328c7c536e43516986eb40 (diff) | |
parent | eee712c82f642320922b9e99e9034a2ce6464591 (diff) |
Merge branch 'dm-empty-blob-viewer-binary' into 'master'
Empty blob viewer isn’t binary-only
See merge request !11979
Diffstat (limited to 'app')
-rw-r--r-- | app/models/blob.rb | 2 | ||||
-rw-r--r-- | app/models/blob_viewer/empty.rb | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/app/models/blob.rb b/app/models/blob.rb index fd95a1b299b..6f7cf35a767 100644 --- a/app/models/blob.rb +++ b/app/models/blob.rb @@ -180,7 +180,7 @@ class Blob < SimpleDelegator end def rendered_as_text?(ignore_errors: true) - simple_viewer.text? && (ignore_errors || simple_viewer.render_error.nil?) + simple_viewer.is_a?(BlobViewer::Text) && (ignore_errors || simple_viewer.render_error.nil?) end def show_viewer_switcher? diff --git a/app/models/blob_viewer/empty.rb b/app/models/blob_viewer/empty.rb index d9d128eb273..2380578ed72 100644 --- a/app/models/blob_viewer/empty.rb +++ b/app/models/blob_viewer/empty.rb @@ -4,6 +4,5 @@ module BlobViewer include ServerSide self.partial_name = 'empty' - self.binary = true end end |