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

Merge pull request #1717 from riyad/add-author-to-tree-listing

Browse source 
Update author info in tree listing
This commit is contained in:
Dmitriy Zaporozhets 2012-10-21 04:08:45 -07:00
commit cd9f135a66
6 changed files with 48 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/views/refs/logs_tree.js.haml
View file

@ -1,9 +1,8 @@
- @logs.each do |content_data|
- file_name = content_data[:file_name]
- content_commit = content_data[:commit]
- tm = @project.team_member_by_name_or_email(content_commit.author_email, content_commit.author_name)
- commit = content_data[:commit]
:plain
var row = $("table.table_#{@hex_path} tr.file_#{hexdigest(file_name)}");
row.find("td.tree_time_ago").html('#{escape_javascript(time_ago_in_words(content_commit.committed_date))} ago');
row.find("td.tree_commit").html('#{escape_javascript(render("tree/tree_commit", tm: tm, content_commit: content_commit))}');
row.find("td.tree_time_ago").html('#{escape_javascript time_ago_in_words(commit.committed_date)} ago');
row.find("td.tree_commit").html('#{escape_javascript render("tree/tree_commit_column", commit: commit)}');

3
app/views/tree/_tree_commit.html.haml
View file

@ -1,3 +0,0 @@
- if tm
= link_to "[#{tm.user_name}]", project_team_member_path(@project, tm)
= link_to_gfm truncate(content_commit.title, length: tm ? 30 : 50), project_commit_path(@project, content_commit.id), class: "tree-commit-link"

2
app/views/tree/_tree_commit_column.html.haml Normal file
View file

@ -0,0 +1,2 @@
%span.tree_author= commit.author_link avatar: true
= link_to_gfm truncate(commit.title, length: 80), project_commit_path(@project, commit.id), class: "tree-commit-link"