aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/deprecation.rb
diff options
context:
space:
mode:
authoraditya-kapoor <aditya.kapoor@vinsol.com>2013-09-01 18:05:04 +0530
committeraditya-kapoor <aditya.kapoor@vinsol.com>2013-09-01 18:05:04 +0530
commit6b9b0767bf480d53029afeb3f8e86f66e933fb41 (patch)
tree62a76c76b8fce484d8a258aceb14ac475f2c94a8 /activesupport/lib/active_support/deprecation.rb
parentb27c40637aaf2549f91faec8e87f6d4afa9a7380 (diff)
parentab0cbff07ebb5df8c9354fa2b3fd9984e039d2c6 (diff)
downloadrails-6b9b0767bf480d53029afeb3f8e86f66e933fb41.tar.gz
rails-6b9b0767bf480d53029afeb3f8e86f66e933fb41.tar.bz2
rails-6b9b0767bf480d53029afeb3f8e86f66e933fb41.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activesupport/lib/active_support/deprecation.rb')
-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 0281c9222e..ab16977bda 100644
--- a/activesupport/lib/active_support/deprecation.rb
+++ b/activesupport/lib/active_support/deprecation.rb
@@ -32,7 +32,7 @@ module ActiveSupport
# and the second is a library name
#
# ActiveSupport::Deprecation.new('2.0', 'MyLibrary')
- def initialize(deprecation_horizon = '4.1', gem_name = 'Rails')
+ def initialize(deprecation_horizon = '4.2', gem_name = 'Rails')
self.gem_name = gem_name
self.deprecation_horizon = deprecation_horizon
# By default, warnings are not silenced and debugging is off.