From 8b77323f5fb66fcc9bf31f25362c502e992a8a0d Mon Sep 17 00:00:00 2001 From: Vokhmin Alexey V Date: Thu, 11 Apr 2013 14:09:32 +0400 Subject: [PATCH] #93: remove _commit_info partial --- .../projects/git/trees/_commit_info.html.haml | 10 ---------- app/views/projects/git/trees/_show.html.haml | 14 +++++++++++--- 2 files changed, 11 insertions(+), 13 deletions(-) delete mode 100644 app/views/projects/git/trees/_commit_info.html.haml diff --git a/app/views/projects/git/trees/_commit_info.html.haml b/app/views/projects/git/trees/_commit_info.html.haml deleted file mode 100644 index cfd84ecda..000000000 --- a/app/views/projects/git/trees/_commit_info.html.haml +++ /dev/null @@ -1,10 +0,0 @@ -- if commit - %td - %span{:style => "display: none;"}= date = commit.committed_date || commit.authored_date - = l(date, :format => :short) - %td= commit.short_message - %td= (commit.committer || commit.author).name -- else - %td - %td - %td \ No newline at end of file diff --git a/app/views/projects/git/trees/_show.html.haml b/app/views/projects/git/trees/_show.html.haml index 4447201ce..3a5feb259 100644 --- a/app/views/projects/git/trees/_show.html.haml +++ b/app/views/projects/git/trees/_show.html.haml @@ -29,8 +29,7 @@ - url = node.url(@treeish).gsub(/^git/, 'http').gsub(/.git$/, '') = link_to(node.name, url, :class => 'files-see') = '@' - - id = node.id - = link_to(id[0..6], "#{url}/tree/#{id}", :class => 'files-see') + = link_to(node.id[0..6], "#{url}/tree/#{node.id}", :class => 'files-see') - else - options = [@project, @treeish, node_path] - if node.is_a?(Grit::Tree) @@ -39,4 +38,13 @@ .pic= image_tag pic || 'code.png' .name= link_to(node.name, path || blob_path(*options), :class => 'files-see') - = render 'commit_info', :commit => commit + - if commit + %td + %span{:style => "display: none;"}= date = commit.committed_date || commit.authored_date + = l(date, :format => :short) + %td= commit.short_message + %td= (commit.committer || commit.author).name + - else + %td + %td + %td