kolan/obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #53 from schmidt/b/412-test-errors-in-1.9.2

Browse Source 
Fix test errors on 1.9.2 after acts_as_journalized merge. #412
This commit is contained in:
Felix Schäfer 2011-05-13 16:36:17 -07:00
commit 00ca2af1d3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vendor/plugins/acts_as_journalized/lib/acts_as_journalized.rb vendored
View File

@ -19,7 +19,7 @@
Dir[File.expand_path("../redmine/acts/journalized/*.rb", __FILE__)].each{|f| require f } Dir[File.expand_path("../redmine/acts/journalized/*.rb", __FILE__)].each{|f| require f }
require_dependency 'lib/ar_condition' require_dependency File.expand_path('lib/ar_condition', Rails.root)
module Redmine module Redmine
module Acts module Acts

2
vendor/plugins/acts_as_journalized/lib/redmine/acts/journalized/deprecated.rb vendored
View File

@ -35,7 +35,7 @@ module Redmine::Acts::Journalized
# FIXME: When the new API is settled, remove me # FIXME: When the new API is settled, remove me
Redmine::Acts::Event::InstanceMethods.instance_methods(false).each do |m| Redmine::Acts::Event::InstanceMethods.instance_methods(false).each do |m|
if m.start_with? "event_" if m.to_s.start_with? "event_"
class_eval(<<-RUBY, __FILE__, __LINE__) class_eval(<<-RUBY, __FILE__, __LINE__)
def #{m} def #{m}
if last_journal.nil? if last_journal.nil?