aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2012-07-20 18:36:47 +0100
committerJon Leighton <j@jonathanleighton.com>2012-07-20 19:00:46 +0100
commit70a86c6e0af44421efd1f1adac963be5291f2341 (patch)
tree86992725dd26e9fce442699ed9d4ca8b475ff62d /activerecord/lib/active_record
parenta63f7a136401b59db52fb802180f6c9793d83bc2 (diff)
downloadrails-70a86c6e0af44421efd1f1adac963be5291f2341.tar.gz
rails-70a86c6e0af44421efd1f1adac963be5291f2341.tar.bz2
rails-70a86c6e0af44421efd1f1adac963be5291f2341.zip
Remove obsolete line.
This code is broken (it should say association_scope.uniq_value rather than options[:uniq]) but the tests still pass. I think it is designed to uniq-ify associations using finder_sql. However, I am about to remove that anyway.
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/associations/collection_association.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb
index 55628c81bb..6ba5ba5228 100644
--- a/activerecord/lib/active_record/associations/collection_association.rb
+++ b/activerecord/lib/active_record/associations/collection_association.rb
@@ -383,7 +383,6 @@ module ActiveRecord
scoped.all
end
- records = options[:uniq] ? uniq(records) : records
records.each { |record| set_inverse_instance(record) }
records
end