From e100d1e489a9d88e86510fcc8f1bdfe0fb54f6a7 Mon Sep 17 00:00:00 2001 From: Mikel Lindsaar Date: Tue, 14 May 2013 15:00:44 +1000 Subject: Update mail to minimum version 2.5.4 --- actionmailer/actionmailer.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actionmailer/actionmailer.gemspec b/actionmailer/actionmailer.gemspec index 67ec0d1097..c56b6979ef 100644 --- a/actionmailer/actionmailer.gemspec +++ b/actionmailer/actionmailer.gemspec @@ -21,5 +21,5 @@ Gem::Specification.new do |s| s.add_dependency 'actionpack', version - s.add_dependency 'mail', '~> 2.5.3' + s.add_dependency 'mail', '~> 2.5.4' end -- cgit v1.2.3 From f93da579ce7f77dbd58b9a2165861aee265b8c93 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Tue, 14 May 2013 10:48:34 -0700 Subject: private callback methods should work --- activesupport/test/callbacks_test.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/activesupport/test/callbacks_test.rb b/activesupport/test/callbacks_test.rb index e23ce8ffb0..af2de7845f 100644 --- a/activesupport/test/callbacks_test.rb +++ b/activesupport/test/callbacks_test.rb @@ -864,8 +864,9 @@ module CallbacksTest include ActiveSupport::Callbacks define_callbacks :foo, :scope => [:name] set_callback :foo, :before, :foo, :if => callback - def foo; end def run; run_callbacks :foo; end + private + def foo; end } object = klass.new object.run -- cgit v1.2.3