diff options
Diffstat (limited to 'activesupport/lib/active_support.rb')
| -rw-r--r-- | activesupport/lib/active_support.rb | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb index 94468240a4..588d6c49f9 100644 --- a/activesupport/lib/active_support.rb +++ b/activesupport/lib/active_support.rb @@ -1,5 +1,5 @@ #-- -# Copyright (c) 2005-2014 David Heinemeier Hansson +# Copyright (c) 2005-2015 David Heinemeier Hansson # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -59,6 +59,7 @@ module ActiveSupport autoload :StringInquirer autoload :TaggedLogging autoload :XmlMini + autoload :ArrayInquirer end autoload :Rescuable @@ -71,14 +72,14 @@ module ActiveSupport NumberHelper.eager_load! end - @@test_order = nil + cattr_accessor :test_order # :nodoc: - def self.test_order=(new_order) - @@test_order = new_order + def self.halt_callback_chains_on_return_false + Callbacks::CallbackChain.halt_and_display_warning_on_return_false end - def self.test_order - @@test_order + def self.halt_callback_chains_on_return_false=(value) + Callbacks::CallbackChain.halt_and_display_warning_on_return_false = value end end |