diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-05-16 20:26:04 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-05-16 20:26:04 +0000 |
| commit | 67312fceaa69abb2bc88aa62601625e9f6a62270 (patch) | |
| tree | f67e39bab7386f870e4908dba0746914a4db7d29 /app/helpers | |
| parent | e66b811d81d399fdfeed13563db108242f9021e6 (diff) | |
| parent | b0a163208c1b428fc9f5adad6489f8a3ab884a2b (diff) | |
| download | gitlab-ce-67312fceaa69abb2bc88aa62601625e9f6a62270.tar.gz | |
Merge branch 'dm-blob-viewer-concerns' into 'master'
Move some blob viewer stuff around without changing behavior
See merge request !11358
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/blob_helper.rb | 8 |
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)}" |