summaryrefslogtreecommitdiff
path: root/app/views/tree
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-10-21 04:08:45 -0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-10-21 04:08:45 -0700
commitcd9f135a660d835763d63a7ffaefb325f03faaeb (patch)
treeda4e6c1b9c6c71d9672765ed8ddf2c58b1ae6bc4 /app/views/tree
parent0189ee97ed34b74cf0f500d678d4435b17ab6a85 (diff)
parent4fd73683d904ecc71af3ebce128630f0f90997ae (diff)
downloadgitlab-ce-cd9f135a660d835763d63a7ffaefb325f03faaeb.tar.gz
Merge pull request #1717 from riyad/add-author-to-tree-listing
Update author info in tree listing
Diffstat (limited to 'app/views/tree')
-rw-r--r--app/views/tree/_tree_commit.html.haml3
-rw-r--r--app/views/tree/_tree_commit_column.html.haml2
2 files changed, 2 insertions, 3 deletions
diff --git a/app/views/tree/_tree_commit.html.haml b/app/views/tree/_tree_commit.html.haml
deleted file mode 100644
index 1bcf1a7ea1d..00000000000
--- a/app/views/tree/_tree_commit.html.haml
+++ /dev/null
@@ -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"
diff --git a/app/views/tree/_tree_commit_column.html.haml b/app/views/tree/_tree_commit_column.html.haml
new file mode 100644
index 00000000000..9d02132b0f4
--- /dev/null
+++ b/app/views/tree/_tree_commit_column.html.haml
@@ -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"