diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-06-08 17:09:47 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-06-08 17:09:47 +0000 |
| commit | 299a3a9aa0a91229f2767113145c3166ac642379 (patch) | |
| tree | 82b690a72bd52c705d91424b97dbe8bb186e569f /app/models/blob.rb | |
| parent | e9002222a0fc65e4e3328c7c536e43516986eb40 (diff) | |
| parent | eee712c82f642320922b9e99e9034a2ce6464591 (diff) | |
| download | gitlab-ce-299a3a9aa0a91229f2767113145c3166ac642379.tar.gz | |
Merge branch 'dm-empty-blob-viewer-binary' into 'master'
Empty blob viewer isn’t binary-only
See merge request !11979
Diffstat (limited to 'app/models/blob.rb')
| -rw-r--r-- | app/models/blob.rb | 2 |
1 files changed, 1 insertions, 1 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? |