From b95c52615153dc95f4c590216c4e24c0bd214979 Mon Sep 17 00:00:00 2001 From: Eric Davis <edavis@littlestreamsoftware.com> Date: Fri, 27 May 2011 14:08:18 -0700 Subject: [PATCH] Fix failing test: RepositoryMercurialTest#test_activities --- app/models/changeset.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/changeset.rb b/app/models/changeset.rb index 5f05dce02..87b8e09e9 100644 --- a/app/models/changeset.rb +++ b/app/models/changeset.rb @@ -26,7 +26,7 @@ class Changeset < ActiveRecord::Base acts_as_journalized :event_title => Proc.new {|o| "#{l(:label_revision)} #{o.format_identifier}" + (o.short_comments.blank? ? '' : (': ' + o.short_comments))}, :event_description => :long_comments, :event_datetime => :committed_on, - :event_url => Proc.new {|o| {:controller => 'repositories', :action => 'revision', :id => o.repository.project, :rev => o.revision}}, + :event_url => Proc.new {|o| {:controller => 'repositories', :action => 'revision', :id => o.repository.project, :rev => o.identifier}}, :activity_timestamp => "#{table_name}.committed_on", :activity_find_options => {:include => [:user, {:repository => :project}]} acts_as_searchable :columns => 'comments', -- GitLab