summaryrefslogtreecommitdiff
path: root/app/models/blob.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-04-21 13:59:34 -0500
committerDouwe Maan <douwe@selenight.nl>2017-04-27 12:23:26 -0500
commit0e0c760e487651cdbddfce818ca6b69ad43fe071 (patch)
tree86351159d35ccb0cc63e4cb565961db8a56309cb /app/models/blob.rb
parenta7fd95cd22062f18474ee038d72fa9e1139a1a84 (diff)
downloadgitlab-ce-0e0c760e487651cdbddfce818ca6b69ad43fe071.tar.gz
Refactor overriding max size
Diffstat (limited to 'app/models/blob.rb')
-rw-r--r--app/models/blob.rb11
1 files changed, 8 insertions, 3 deletions
diff --git a/app/models/blob.rb b/app/models/blob.rb
index 65356f01cc2..dedf60ca14a 100644
--- a/app/models/blob.rb
+++ b/app/models/blob.rb
@@ -122,12 +122,17 @@ class Blob < SimpleDelegator
@rich_viewer ||= rich_viewer_class&.new(self)
end
- def rendered_as_text?(override_max_size: false)
- simple_viewer.is_a?(BlobViewer::Text) && !simple_viewer.render_error(override_max_size: override_max_size)
+ def rendered_as_text?(ignore_errors: true)
+ simple_viewer.is_a?(BlobViewer::Text) && (ignore_errors || simple_viewer.render_error.nil?)
end
def show_viewer_switcher?
- simple_viewer.is_a?(BlobViewer::Text) && rich_viewer
+ rendered_as_text? && rich_viewer
+ end
+
+ def override_max_size!
+ simple_viewer&.override_max_size = true
+ rich_viewer&.override_max_size = true
end
private