OSDN Git Service

Merge branch 'dev'
authorDmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>
Wed, 9 Nov 2011 18:29:59 +0000 (20:29 +0200)
committerDmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>
Wed, 9 Nov 2011 18:29:59 +0000 (20:29 +0200)
Conflicts:
app/helpers/dashboard_helper.rb

1  2 
app/helpers/dashboard_helper.rb

@@@ -19,15 -19,12 +19,15 @@@ module DashboardHelpe
    end
  
    def dashboard_feed_title(object)
 -    title = case object.class.name.to_s
 +    klass = object.class.to_s.split("::").last
 +
 +    title = case klass
              when "Note" then markdown(object.note)
              when "Issue" then object.title
-             when "Commit" then object.safe_message
-             else ""
+             when "Grit::Commit" then object.safe_message
+             else return "Project Wall"
              end
 -    "[#{object.class.name}] #{truncate(sanitize(title, :tags => []), :length => 60)} "
 +
 +    "[#{klass}] #{truncate(sanitize(title, :tags => []), :length => 60)} "
    end
  end