diff options
author | Douwe Maan <douwe@selenight.nl> | 2017-05-08 18:58:54 -0500 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2017-05-09 11:35:52 -0500 |
commit | 5a1e159b7ba097ad083416b8bc64bec1228097fe (patch) | |
tree | d6ff91cdfae72ec5f5cd68832ab52e53bc6b17d9 /app/helpers | |
parent | f59a44dbdf616d29e0185090a1401a6706aef33f (diff) | |
download | gitlab-ce-5a1e159b7ba097ad083416b8bc64bec1228097fe.tar.gz |
Make tree, blob and blame pages more consistent
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/blob_helper.rb | 2 | ||||
-rw-r--r-- | app/helpers/commits_helper.rb | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb index af430270ae4..eb37f2e0267 100644 --- a/app/helpers/blob_helper.rb +++ b/app/helpers/blob_helper.rb @@ -18,7 +18,7 @@ module BlobHelper blob = options.delete(:blob) blob ||= project.repository.blob_at(ref, path) rescue nil - return unless blob + return unless blob && blob.readable_text? common_classes = "btn js-edit-blob #{options[:extra_class]}" diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb index cef624430da..97b497a0fed 100644 --- a/app/helpers/commits_helper.rb +++ b/app/helpers/commits_helper.rb @@ -100,17 +100,15 @@ module CommitsHelper end def link_to_browse_code(project, commit) + return unless current_controller?(:projects, :commits) + if @path.blank? return link_to( "Browse Files", namespace_project_tree_path(project.namespace, project, commit), class: "btn btn-default" ) - end - - return unless current_controller?(:projects, :commits) - - if @repo.blob_at(commit.id, @path) + elsif @repo.blob_at(commit.id, @path) return link_to( "Browse File", namespace_project_blob_path(project.namespace, project, |