deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'dev' into issue-184

Browse source 
Conflicts:
	app/views/layouts/project.html.haml
This commit is contained in:
Aleksei Kvitinskii 2011-11-07 21:29:28 +02:00
commit 444b69ddc2
17 changed files with 106 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/views/projects/_tree_item.html.haml
View file

@ -11,5 +11,8 @@
%td
= time_ago_in_words(content_commit.committed_date)
ago
%td
= link_to truncate(content_commit.safe_message, :length => 40), project_commit_path(@project, content_commit)
%td.commit
= link_to truncate(content_commit.safe_message, :length => fixed_mode? ? 40 : 80), project_commit_path(@project, content_commit), :class => "tree-commit-link"
- tm = @project.team_member_by_name_or_email(content_commit.author_email, content_commit.author_name)
- if tm
= link_to "[#{tm.user_name}]", project_team_member_path(@project, tm)