kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Use #author_link for blame, commits and tree

This commit is contained in:
Riyad Preukschas 2012-10-27 18:27:47 +02:00
parent c78359a84b
commit 3d0197246e
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/blame/show.html.haml
View File

@ -24,9 +24,7 @@
- commit = Commit.new(commit) - commit = Commit.new(commit)
- commit = CommitDecorator.decorate(commit) - commit = CommitDecorator.decorate(commit)
%tr %tr
%td.author %td.author= commit.author_link avatar: true, size: 16
= image_tag gravatar_icon(commit.author_email, 16)
= commit.author_name
%td.blame_commit %td.blame_commit
   
%code= link_to commit.short_id, project_commit_path(@project, commit) %code= link_to commit.short_id, project_commit_path(@project, commit)

3
app/views/commits/_commit.html.haml
View File

@ -4,9 +4,8 @@
%strong= link_to "Browse Code »", project_tree_path(@project, commit), class: "right" %strong= link_to "Browse Code »", project_tree_path(@project, commit), class: "right"
%p %p
= link_to commit.short_id(8), project_commit_path(@project, commit), class: "commit_short_id" = link_to commit.short_id(8), project_commit_path(@project, commit), class: "commit_short_id"
%strong.commit-author-name= commit.author_name %strong= commit.author_link avatar: true, size: 24
%span.dash – %span.dash –
= image_tag gravatar_icon(commit.author_email), class: "avatar", width: 16
= link_to_gfm truncate(commit.title, length: 50), project_commit_path(@project, commit.id), class: "row_title" = link_to_gfm truncate(commit.title, length: 50), project_commit_path(@project, commit.id), class: "row_title"
%span.committed_ago %span.committed_ago

5
app/views/commits/_commit_box.html.haml
View File

@ -18,16 +18,15 @@
.commit-info .commit-info
.row .row
.span5 .span5
= image_tag gravatar_icon(@commit.author_email, 40), class: "avatar"
.author .author
%strong= @commit.author_name %strong= @commit.author_link avatar: true, size: 40
authored authored
%time{title: @commit.authored_date.stamp("Aug 21, 2011 9:23pm")} %time{title: @commit.authored_date.stamp("Aug 21, 2011 9:23pm")}
#{time_ago_in_words(@commit.authored_date)} ago #{time_ago_in_words(@commit.authored_date)} ago
- if @commit.different_committer? - if @commit.different_committer?
.committer .committer
→ →
%strong= @commit.committer_name %strong= @commit.committer_link
committed committed
%time{title: @commit.committed_date.stamp("Aug 21, 2011 9:23pm")} %time{title: @commit.committed_date.stamp("Aug 21, 2011 9:23pm")}
#{time_ago_in_words(@commit.committed_date)} ago #{time_ago_in_words(@commit.committed_date)} ago