summaryrefslogtreecommitdiff
path: root/app/models/blob_viewer
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-04-25 15:22:56 -0500
committerDouwe Maan <douwe@selenight.nl>2017-04-27 12:23:26 -0500
commit964e7d206b2c9ce0c884ee5c13fafa3763a142a2 (patch)
tree32ea77b2d528bef67b4ed526f8b5520ffea666ba /app/models/blob_viewer
parentb73b16798dd0fe402df42a1e706f3b1034c22270 (diff)
downloadgitlab-ce-964e7d206b2c9ce0c884ee5c13fafa3763a142a2.tar.gz
Add specs
Diffstat (limited to 'app/models/blob_viewer')
-rw-r--r--app/models/blob_viewer/base.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/blob_viewer/base.rb b/app/models/blob_viewer/base.rb
index d44d5c70fbb..d3674530273 100644
--- a/app/models/blob_viewer/base.rb
+++ b/app/models/blob_viewer/base.rb
@@ -56,10 +56,10 @@ module BlobViewer
end
def render_error
- if override_max_size ? absolutely_too_large? : too_large?
- :too_large
- elsif server_side_but_stored_in_lfs?
+ if server_side_but_stored_in_lfs?
:server_side_but_stored_in_lfs
+ elsif override_max_size ? absolutely_too_large? : too_large?
+ :too_large
end
end