Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into normalizecb

* master:
  private callback methods should work
  Update mail to minimum version 2.5.4
  • Loading branch information...
commit 9dcecbb080dca8e9525bcbc9a2d64ab4b417dd6d 2 parents 73aefee + f93da57
@tenderlove tenderlove authored
View
2  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
View
3  activesupport/test/callbacks_test.rb
@@ -864,8 +864,9 @@ def test_class_conditional_with_scope
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
Please sign in to comment.
Something went wrong with that request. Please try again.