summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-05-15 10:03:34 -0500
committerDouwe Maan <douwe@selenight.nl>2017-05-15 10:03:34 -0500
commitb0a163208c1b428fc9f5adad6489f8a3ab884a2b (patch)
treeabd5fa0ff2fb12d00a2a7b199ce2fb5eb1ef12e2 /app/helpers
parentacffc062133e5793ac08b9529ab54689557766d4 (diff)
downloadgitlab-ce-b0a163208c1b428fc9f5adad6489f8a3ab884a2b.tar.gz
Rename BlobViewer max_size to overridable_max_size and absolute_max_size to max_sizedm-blob-viewer-concerns
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/blob_helper.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb
index eb37f2e0267..7eb3512378c 100644
--- a/app/helpers/blob_helper.rb
+++ b/app/helpers/blob_helper.rb
@@ -226,7 +226,7 @@ module BlobHelper
def open_raw_blob_button(blob)
return if blob.empty?
-
+
if blob.raw_binary? || blob.stored_externally?
icon = icon('download')
title = 'Download'
@@ -242,9 +242,9 @@ module BlobHelper
case viewer.render_error
when :too_large
max_size =
- if viewer.absolutely_too_large?
- viewer.absolute_max_size
- elsif viewer.too_large?
+ if viewer.can_override_max_size?
+ viewer.overridable_max_size
+ else
viewer.max_size
end
"it is larger than #{number_to_human_size(max_size)}"