aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-06-17 21:40:34 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-06-17 21:40:34 -0700
commit284ebf2a1c5eead05f4b24ffbe109db4837cce44 (patch)
tree3e504021ce9985c6327ead52ee30cc61449e3568
parented93c86c5ddee83c9987f30b289c7c4bfb21b804 (diff)
parenta556c7e25b135e08fd0707f0e2cb01100db65501 (diff)
downloadrails-284ebf2a1c5eead05f4b24ffbe109db4837cce44.tar.gz
rails-284ebf2a1c5eead05f4b24ffbe109db4837cce44.tar.bz2
rails-284ebf2a1c5eead05f4b24ffbe109db4837cce44.zip
Merge pull request #6764 from frodsan/patch-4
bump AS deprecation_horizon to 4.0
-rw-r--r--activesupport/lib/active_support/deprecation.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/deprecation.rb b/activesupport/lib/active_support/deprecation.rb
index 45b9dda5ca..9a4b249051 100644
--- a/activesupport/lib/active_support/deprecation.rb
+++ b/activesupport/lib/active_support/deprecation.rb
@@ -9,10 +9,10 @@ module ActiveSupport
# The version the deprecated behavior will be removed, by default.
attr_accessor :deprecation_horizon
end
- self.deprecation_horizon = '3.2'
+ self.deprecation_horizon = '4.0'
# By default, warnings are not silenced and debugging is off.
self.silenced = false
self.debug = false
end
-end
+end \ No newline at end of file