aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2011-01-03 19:54:38 +0000
committerAaron Patterson <aaron.patterson@gmail.com>2011-01-03 16:24:32 -0800
commit0619dc2319cf839977ea9670a52d9280a1af3595 (patch)
tree74529dc1679b24520bc61ea0e453b724b94b94cd /activesupport/lib
parenta9bed985cfd7d1ae93f475542bb878aa939e1c1e (diff)
downloadrails-0619dc2319cf839977ea9670a52d9280a1af3595.tar.gz
rails-0619dc2319cf839977ea9670a52d9280a1af3595.tar.bz2
rails-0619dc2319cf839977ea9670a52d9280a1af3595.zip
Implement deprecated version of AssociationReflection#primary_key_name, which has been renamed to #foreign_key. Also bumping the deprecation_horizon in Active Support to 3.1.
Diffstat (limited to 'activesupport/lib')
-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 e3e63ce316..ce0775a690 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.0'
+ self.deprecation_horizon = '3.1'
# By default, warnings are not silenced and debugging is off.
self.silenced = false