diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-06-08 20:15:16 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-06-08 20:15:16 +0300 |
| commit | 6cbe38675dcd0547d9127373851471008e624e2b (patch) | |
| tree | 82a89b246a2fa06a0eee9756929e06e059c17a7d /app/models/blob_viewer | |
| parent | 299a3a9aa0a91229f2767113145c3166ac642379 (diff) | |
| parent | 369d681eec8177f03bf3b4f694e03098447dae09 (diff) | |
Merge branch 'dm-blob-file-type' into 'master'
Add Blob#file_type convenience method
See merge request !11982
Diffstat (limited to 'app/models/blob_viewer')
| -rw-r--r-- | app/models/blob_viewer/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/blob_viewer/base.rb b/app/models/blob_viewer/base.rb index e6119d25fab..d2aa33d994e 100644 --- a/app/models/blob_viewer/base.rb +++ b/app/models/blob_viewer/base.rb @@ -52,7 +52,7 @@ module BlobViewer def self.can_render?(blob, verify_binary: true) return false if verify_binary && binary? != blob.binary? return true if extensions&.include?(blob.extension) - return true if file_types&.include?(Gitlab::FileDetector.type_of(blob.path)) + return true if file_types&.include?(blob.file_type) false end |