aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortwinturbo <me@broadcastingadam.com>2012-04-17 22:01:06 +0200
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-04-28 13:40:30 -0300
commit9608395923899e3f91e0d07ac2ed52efc17bcc40 (patch)
tree59e943f447ffdc89a506718e27453bfe7911eafe
parent76cd1ca08dc31babd7e9e527a8a9c86321ed905a (diff)
downloadrails-9608395923899e3f91e0d07ac2ed52efc17bcc40.tar.gz
rails-9608395923899e3f91e0d07ac2ed52efc17bcc40.tar.bz2
rails-9608395923899e3f91e0d07ac2ed52efc17bcc40.zip
Document #behavior= and update CHANGELOG
-rw-r--r--activesupport/CHANGELOG.md2
-rw-r--r--activesupport/lib/active_support/deprecation/behaviors.rb7
2 files changed, 9 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index b6c3e91db8..77fa753ab3 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,5 +1,7 @@
## Rails 4.0.0 (unreleased) ##
+* Add ActiveSupport::Deprecations.behavior = :slience to to completely ignore *twinturbo*
+
* Make Module#delegate stop using `send` - can no longer delegate to private methods. *dasch*
* AS::Callbacks: deprecate `:rescuable` option. *Bogdan Gusiev*
diff --git a/activesupport/lib/active_support/deprecation/behaviors.rb b/activesupport/lib/active_support/deprecation/behaviors.rb
index 8d92c50679..73b6a42505 100644
--- a/activesupport/lib/active_support/deprecation/behaviors.rb
+++ b/activesupport/lib/active_support/deprecation/behaviors.rb
@@ -13,6 +13,13 @@ module ActiveSupport
# Sets the behavior to the specified value. Can be a single value or an array.
#
+ # Available behaviors:
+ #
+ # [+:stderr+] Print deprecations to +$stderror+
+ # [+:log+] Send to +Rails.logger+
+ # [+:notify+] Instrument using +ActiveSupport::Notifications+
+ # [+:silence+] Do nothing
+ #
# Examples
#
# ActiveSupport::Deprecation.behavior = :stderr