From eee712c82f642320922b9e99e9034a2ce6464591 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Tue, 6 Jun 2017 16:22:28 -0500 Subject: =?UTF-8?q?Empty=20blob=20viewer=20isn=E2=80=99t=20binary-only?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/blob.rb | 2 +- app/models/blob_viewer/empty.rb | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'app/models') diff --git a/app/models/blob.rb b/app/models/blob.rb index 6a42a12891c..bba23bbb7e0 100644 --- a/app/models/blob.rb +++ b/app/models/blob.rb @@ -176,7 +176,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 -- cgit v1.2.1