aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@plataformatec.com.br>2012-06-17 10:59:55 -0700
committerJosé Valim <jose.valim@plataformatec.com.br>2012-06-17 10:59:55 -0700
commit69881ecdaf204a8e864cdda6af33cc258df544ae (patch)
treeba7f7a2f66748cb09f68c990e42e6a8d5457146d /activesupport
parent8690d5a4e3e684d13aed10f7b773f458fef33d01 (diff)
parent824733612eaa408f699c5c78018d72f49c34a061 (diff)
downloadrails-69881ecdaf204a8e864cdda6af33cc258df544ae.tar.gz
rails-69881ecdaf204a8e864cdda6af33cc258df544ae.tar.bz2
rails-69881ecdaf204a8e864cdda6af33cc258df544ae.zip
Merge pull request #6762 from frodsan/patch-3
bump AS deprecation_horizon to 4.1
Diffstat (limited to 'activesupport')
-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 176edefa42..e3b4a7240e 100644
--- a/activesupport/lib/active_support/deprecation.rb
+++ b/activesupport/lib/active_support/deprecation.rb
@@ -10,10 +10,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.1'
# 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