summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorgitlabhq <m@gitlabhq.com>2011-11-22 08:33:42 -0500
committergitlabhq <m@gitlabhq.com>2011-11-22 08:33:42 -0500
commit3f562027139913f3ee46f8c97b86fc7ef536319f (patch)
treedf7a6a1d36995bd237819b0229ce787cf50e067a /app
parent78e6dc5fa5821039feef0a16c8cab5d77813440a (diff)
downloadgitlab-ce-3f562027139913f3ee46f8c97b86fc7ef536319f.tar.gz
dashboard replaced [event] by tag
Diffstat (limited to 'app')
-rw-r--r--app/helpers/dashboard_helper.rb2
-rw-r--r--app/views/dashboard/index.html.haml5
2 files changed, 4 insertions, 3 deletions
diff --git a/app/helpers/dashboard_helper.rb b/app/helpers/dashboard_helper.rb
index 6115ae4def5..6666cabc2d7 100644
--- a/app/helpers/dashboard_helper.rb
+++ b/app/helpers/dashboard_helper.rb
@@ -28,6 +28,6 @@ module DashboardHelper
else return "Project Wall"
end
- "[#{klass}] #{truncate(sanitize(title, :tags => []), :length => 60)} "
+ truncate(sanitize(title, :tags => []), :length => 60)
end
end
diff --git a/app/views/dashboard/index.html.haml b/app/views/dashboard/index.html.haml
index 21689759964..aa8b9db75fc 100644
--- a/app/views/dashboard/index.html.haml
+++ b/app/views/dashboard/index.html.haml
@@ -27,13 +27,14 @@
%a.project-update{:href => dashboard_feed_path(project, update)}
= image_tag gravatar_icon(update.author_email), :class => "left", :width => 40
%span.update-title
- - if update.kind_of?(Grit::Commit)
- %span.right.tag.commit= update.head.name
= dashboard_feed_title(update)
%span.update-author
%strong= update.author_name
authored
= time_ago_in_words(update.created_at)
ago
+ .right
+ - klass = update.class.to_s.split("::").last.downcase
+ %span.tag{ :class => klass }= klass
/ #news-feed
/ #dashboard-content