Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-07-22 15:08:24 +0400
committerRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-07-22 15:08:24 +0400
commit34cea1cb632c907ae399df64c60e93a5c716eeca (patch)
treef4dad590f65b1bee8ff8de0dd718768d2d8e9031 /app/views/refs
parentff40b7de7a6451bb9e3bc12a18070bbff13b6a68 (diff)
Update views to use CommitDecorator
Diffstat (limited to 'app/views/refs')
-rw-r--r--app/views/refs/_tree_commit.html.haml2
-rw-r--r--app/views/refs/blame.html.haml5
2 files changed, 4 insertions, 3 deletions
diff --git a/app/views/refs/_tree_commit.html.haml b/app/views/refs/_tree_commit.html.haml
index 1f2524a4c3a..7da8ae1c501 100644
--- a/app/views/refs/_tree_commit.html.haml
+++ b/app/views/refs/_tree_commit.html.haml
@@ -1,3 +1,3 @@
- if tm
%strong= link_to "[#{tm.user_name}]", project_team_member_path(@project, tm)
-= link_to truncate(content_commit.safe_message, :length => tm ? 30 : 50), project_commit_path(@project, content_commit.id), :class => "tree-commit-link"
+= link_to truncate(content_commit.title, :length => tm ? 30 : 50), project_commit_path(@project, content_commit.id), :class => "tree-commit-link"
diff --git a/app/views/refs/blame.html.haml b/app/views/refs/blame.html.haml
index 6a86b91fe74..0f0b6927157 100644
--- a/app/views/refs/blame.html.haml
+++ b/app/views/refs/blame.html.haml
@@ -25,6 +25,7 @@
%table
- @blame.each do |commit, lines|
- commit = Commit.new(commit)
+ - commit = CommitDecorator.decorate(commit)
%tr
%td.author
= image_tag gravatar_icon(commit.author_email, 16)
@@ -32,8 +33,8 @@
%td.blame_commit
&nbsp;
= link_to project_commit_path(@project, :id => commit.id) do
- %code= commit.id.to_s[0..10]
- %span.row_title= truncate(commit.safe_message, :length => 30) rescue "--broken encoding"
+ %code= commit.short_id
+ %span.row_title= truncate(commit.title, :length => 30) rescue "--broken encoding"
%td.lines
= preserve do
%pre