diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-05-17 17:49:33 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-05-17 17:49:33 +0530 |
| commit | 03f8a574872f1206c16720af034e4bb91930d237 (patch) | |
| tree | bb4a38ffdf977296bfb90989308994e1c4c01fa6 /activerecord/lib/active_record/associations.rb | |
| parent | 17f583b7bc004adbb1ac44f156c806df018c7365 (diff) | |
| parent | 612f7fe7014294d646f4b46ed3b927f68ee76fc7 (diff) | |
| download | rails-03f8a574872f1206c16720af034e4bb91930d237.tar.gz rails-03f8a574872f1206c16720af034e4bb91930d237.tar.bz2 rails-03f8a574872f1206c16720af034e4bb91930d237.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
activerecord/lib/active_record/core.rb
Diffstat (limited to 'activerecord/lib/active_record/associations.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index c30e8e08b8..68f8bbeb1c 100644 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -543,7 +543,7 @@ module ActiveRecord # end # # @group = Group.first - # @group.users.collect { |u| u.avatar }.flatten # select all avatars for all users in the group + # @group.users.collect { |u| u.avatar }.compact # select all avatars for all users in the group # @group.avatars # selects all avatars by going through the User join model. # # An important caveat with going through +has_one+ or +has_many+ associations on the |