diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/blob/pdf/index.js | 2 | ||||
| -rw-r--r-- | app/models/blob.rb | 4 | ||||
| -rw-r--r-- | app/models/blob_viewer/base.rb | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/javascripts/blob/pdf/index.js b/app/assets/javascripts/blob/pdf/index.js index a74c2db9a61..9161be98853 100644 --- a/app/assets/javascripts/blob/pdf/index.js +++ b/app/assets/javascripts/blob/pdf/index.js @@ -31,7 +31,7 @@ export default () => { }, }, template: ` - <div class="container-fluid md prepend-top-default append-bottom-default"> + <div class="js-pdf-viewer container-fluid md prepend-top-default append-bottom-default"> <div class="text-center loading" v-if="loading && !error"> diff --git a/app/models/blob.rb b/app/models/blob.rb index 0df220b4983..e87b418d242 100644 --- a/app/models/blob.rb +++ b/app/models/blob.rb @@ -100,11 +100,11 @@ class Blob < SimpleDelegator end def valid_lfs_pointer? - lfs_pointer? && project.lfs_enabled? + lfs_pointer? && project&.lfs_enabled? end def invalid_lfs_pointer? - lfs_pointer? && !project.lfs_enabled? + lfs_pointer? && !project&.lfs_enabled? end def simple_viewer 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 |