diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2008-11-26 20:04:00 +0100 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-11-26 20:04:00 +0100 |
| commit | e2362babdf16079727966dea046bdd2ee67e716d (patch) | |
| tree | 57d03786603e85292dd16b1194ccf5fc78028bd8 /activerecord/lib | |
| parent | 4999d52e08a02ebba344f6c318f0af4b5b18f0e5 (diff) | |
| parent | 9a4d557713acb0fc8e80f61af18094034aca029a (diff) | |
| download | rails-e2362babdf16079727966dea046bdd2ee67e716d.tar.gz rails-e2362babdf16079727966dea046bdd2ee67e716d.tar.bz2 rails-e2362babdf16079727966dea046bdd2ee67e716d.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'activerecord/lib')
| -rwxr-xr-x | activerecord/lib/active_record/associations.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 63e28a43ab..0546b76c63 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -1733,6 +1733,7 @@ module ActiveRecord case cond when nil then all when Array then all << cond.first + when Hash then all << cond.keys else all << cond end end |