diff options
author | Marin Jankovski <maxlazio@gmail.com> | 2015-12-07 15:56:38 +0100 |
---|---|---|
committer | Marin Jankovski <maxlazio@gmail.com> | 2015-12-07 15:56:38 +0100 |
commit | bf17609e2a4cc062a9bccd67e90dd6524f0389b2 (patch) | |
tree | ede9dded656feb0d0b49974a4b791e9ae9bad1ff /app/helpers | |
parent | e53b350cb6db7438c1a50c500b324fd87afc41c4 (diff) | |
download | gitlab-ce-bf17609e2a4cc062a9bccd67e90dd6524f0389b2.tar.gz |
Rename blob helper, bump version of gitlab_git to 7.2.21.
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/blob_helper.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb index fa1b2522051..4a3d971f7c6 100644 --- a/app/helpers/blob_helper.rb +++ b/app/helpers/blob_helper.rb @@ -30,7 +30,7 @@ module BlobHelper nil end - if blob && blob.text? && !blob.lfs_pointer? + if blob_viewable?(blob) text = 'Edit' after = options[:after] || '' from_mr = options[:from_merge_request_id] @@ -72,8 +72,8 @@ module BlobHelper icon("#{file_type_icon_class('file', mode, name)} fw") end - def viewable?(blob) - blob.text? && !blob.lfs_pointer? + def blob_viewable?(blob) + blob && blob.text? && !blob.lfs_pointer? end def blob_size(blob) |