diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-08-05 01:15:57 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-08-05 01:15:57 +0200 |
| commit | 3cbe111439b22f11670587e2ec6779533dd77090 (patch) | |
| tree | 541ec151c0899e21c3bef1c4b7ad9136b42f9b2f /activerecord/lib/active_record/associations/has_many_association.rb | |
| parent | ec736dff7b0a05d58d4c8780863afc47e2bb74a3 (diff) | |
| parent | d191db76e04f065e1b0cff3766c818f9b8e2f43a (diff) | |
| download | rails-3cbe111439b22f11670587e2ec6779533dd77090.tar.gz rails-3cbe111439b22f11670587e2ec6779533dd77090.tar.bz2 rails-3cbe111439b22f11670587e2ec6779533dd77090.zip | |
Merge remote branch 'docrails/master'
Diffstat (limited to 'activerecord/lib/active_record/associations/has_many_association.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/has_many_association.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/has_many_association.rb b/activerecord/lib/active_record/associations/has_many_association.rb index d74fb7c702..c33bc6aa47 100644 --- a/activerecord/lib/active_record/associations/has_many_association.rb +++ b/activerecord/lib/active_record/associations/has_many_association.rb @@ -24,7 +24,7 @@ module ActiveRecord # If the association has a counter cache it gets that value. Otherwise # it will attempt to do a count via SQL, bounded to <tt>:limit</tt> if # there's one. Some configuration options like :group make it impossible - # to do a SQL count, in those cases the array count will be used. + # to do an SQL count, in those cases the array count will be used. # # That does not depend on whether the collection has already been loaded # or not. The +size+ method is the one that takes the loaded flag into |