aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/builder/singular_association.rb
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-05-25 22:49:23 +0200
committerXavier Noria <fxn@hashref.com>2011-05-25 22:49:23 +0200
commitb7921f50e7cb08bbfddacbcc46b22dc74738cc5c (patch)
treea87d6c7e692bbf7eb75fd34ab8610f6d16369585 /activerecord/lib/active_record/associations/builder/singular_association.rb
parent00e1d0832e1242fe41cf43490b0a3a21a40f3c26 (diff)
parent6b436c23a90cb3bb2e2d55902a55fc6f659b90be (diff)
downloadrails-b7921f50e7cb08bbfddacbcc46b22dc74738cc5c.tar.gz
rails-b7921f50e7cb08bbfddacbcc46b22dc74738cc5c.tar.bz2
rails-b7921f50e7cb08bbfddacbcc46b22dc74738cc5c.zip
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'activerecord/lib/active_record/associations/builder/singular_association.rb')
-rw-r--r--activerecord/lib/active_record/associations/builder/singular_association.rb13
1 files changed, 0 insertions, 13 deletions
diff --git a/activerecord/lib/active_record/associations/builder/singular_association.rb b/activerecord/lib/active_record/associations/builder/singular_association.rb
index 638a2ec72a..0cbbba041a 100644
--- a/activerecord/lib/active_record/associations/builder/singular_association.rb
+++ b/activerecord/lib/active_record/associations/builder/singular_association.rb
@@ -13,19 +13,6 @@ module ActiveRecord::Associations::Builder
private
- def define_readers
- super
- name = self.name
-
- model.redefine_method("#{name}_loaded?") do
- ActiveSupport::Deprecation.warn(
- "Calling obj.#{name}_loaded? is deprecated. Please use " \
- "obj.association(:#{name}).loaded? instead."
- )
- association(name).loaded?
- end
- end
-
def define_constructors
name = self.name