From f4ae433d9017c0b6e9f3ffcb68dc0426ca7b721d Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Sat, 6 Apr 2013 15:53:35 +0300
Subject: [PATCH] Increase event title font size on dashboard activity feed

---
 app/assets/stylesheets/sections/events.scss | 1 +
 app/models/event.rb                         | 2 +-
 app/views/events/event/_common.html.haml    | 8 ++++++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/sections/events.scss b/app/assets/stylesheets/sections/events.scss
index 94e1d0b..d365dd7 100644
--- a/app/assets/stylesheets/sections/events.scss
+++ b/app/assets/stylesheets/sections/events.scss
@@ -35,6 +35,7 @@
   .event-title {
     color: #333;
     font-weight: bold;
+    font-size: 14px;
     .author_name {
       color: #333;
     }
diff --git a/app/models/event.rb b/app/models/event.rb
index 7488b99..97f96ac 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -134,7 +134,7 @@ class Event < ActiveRecord::Base
     if closed?
       "closed"
     elsif merged?
-      "merged"
+      "accepted"
     elsif joined?
       'joined'
     elsif left?
diff --git a/app/views/events/event/_common.html.haml b/app/views/events/event/_common.html.haml
index 53cbe1c..05d3832 100644
--- a/app/views/events/event/_common.html.haml
+++ b/app/views/events/event/_common.html.haml
@@ -2,11 +2,15 @@
   %span.author_name= link_to_author event
   %span.event_label{class: event.action_name}= event_action_name(event)
   - if event.target
-    %strong= link_to_gfm truncate(event.target_title), [event.project, event.target]
+    %strong= link_to "##{event.target_id}", [event.project, event.target]
   - else
-    %strong= gfm truncate(event.target_title)
+    %strong= gfm event.target_title
   at
   - if event.project
     = link_to_project event.project
   - else
     = event.project_name
+.event-body
+  .event-note
+    - if event.target.respond_to?(:title)
+      = event.target.title
--
libgit2 0.21.2