diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-04-21 13:59:34 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-04-27 12:23:26 -0500 |
| commit | 0e0c760e487651cdbddfce818ca6b69ad43fe071 (patch) | |
| tree | 86351159d35ccb0cc63e4cb565961db8a56309cb /app/helpers/blob_helper.rb | |
| parent | a7fd95cd22062f18474ee038d72fa9e1139a1a84 (diff) | |
| download | gitlab-ce-0e0c760e487651cdbddfce818ca6b69ad43fe071.tar.gz | |
Refactor overriding max size
Diffstat (limited to 'app/helpers/blob_helper.rb')
| -rw-r--r-- | app/helpers/blob_helper.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb index 7db9cf0ff01..00cf0ac96c9 100644 --- a/app/helpers/blob_helper.rb +++ b/app/helpers/blob_helper.rb @@ -219,7 +219,13 @@ module BlobHelper def blob_render_error_reason(viewer, error) case error when :too_large - "it is larger than #{number_to_human_size(viewer.relevant_max_size)}" + max_size = + if viewer.absolutely_too_large? + viewer.absolute_max_size + elsif viewer.too_large? + viewer.max_size + end + "it is larger than #{number_to_human_size(max_size)}" when :server_side_but_stored_in_lfs "it is stored in LFS" end @@ -232,7 +238,7 @@ module BlobHelper options << link_to('load it anyway', url_for(params.merge(viewer: viewer.type, override_max_size: true, format: nil))) end - if viewer.rich? && viewer.blob.rendered_as_text?(override_max_size: true) + if viewer.rich? && viewer.blob.rendered_as_text? options << link_to('view the source', '#', class: 'js-blob-viewer-switch-btn', data: { viewer: 'simple' }) end |