aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-04-25 10:58:50 -0700
committerJosé Valim <jose.valim@gmail.com>2011-04-25 10:58:50 -0700
commitf3c335f1cd6ab74e6feb2fc51d0315e29f555473 (patch)
tree1b42797c7479088e5c4a7a8cd3362e6152b6975d
parent17fec021d196ffbd745c340f98b9cfbcdb16b2a8 (diff)
parent75216248ef450974c6ea38358b6ea67a59dab328 (diff)
downloadrails-f3c335f1cd6ab74e6feb2fc51d0315e29f555473.tar.gz
rails-f3c335f1cd6ab74e6feb2fc51d0315e29f555473.tar.bz2
rails-f3c335f1cd6ab74e6feb2fc51d0315e29f555473.zip
Merged pull request #305 from joshk/bump_deprecation.
bump AS deprecation_horizon to 3.2
-rw-r--r--activesupport/lib/active_support/deprecation.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/deprecation.rb b/activesupport/lib/active_support/deprecation.rb
index ce0775a690..45b9dda5ca 100644
--- a/activesupport/lib/active_support/deprecation.rb
+++ b/activesupport/lib/active_support/deprecation.rb
@@ -9,7 +9,7 @@ module ActiveSupport
# The version the deprecated behavior will be removed, by default.
attr_accessor :deprecation_horizon
end
- self.deprecation_horizon = '3.1'
+ self.deprecation_horizon = '3.2'
# By default, warnings are not silenced and debugging is off.
self.silenced = false