diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2012-05-05 21:36:24 +0100 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2012-05-05 21:36:24 +0100 |
| commit | 06c787d2359660529ff5b927d3d34f22379eef00 (patch) | |
| tree | 2fcc97230e0ec2be6bca91465d75b6a434f2b6da /activerecord/test/models/string_key_object.rb | |
| parent | dcd04e76179611a9db28c9e391aa7d6c2a5b046a (diff) | |
| download | rails-06c787d2359660529ff5b927d3d34f22379eef00.tar.gz rails-06c787d2359660529ff5b927d3d34f22379eef00.tar.bz2 rails-06c787d2359660529ff5b927d3d34f22379eef00.zip | |
Revert "Merge pull request #5494 from armstrjare/active_record_relation_keep_association_join_context_on_merge"
This reverts commit dcd04e76179611a9db28c9e391aa7d6c2a5b046a, reversing
changes made to 58a49875df63729f07a9a81d1ee349087d258df5.
Diffstat (limited to 'activerecord/test/models/string_key_object.rb')
0 files changed, 0 insertions, 0 deletions