Sean Griffin b64b754510 Revert "Change WhereClause#merge to same named columns on diff tables" ... This reverts commit 5d41cb3bfd. This implementation does not properly handle cases involving predicates which are not associated with a bind param. I have the fix in mind, but don't have time to implement just yet. It will be more similar to #22823 than not.		2016-01-12 15:48:00 -07:00
..
active_record	Revert "Change WhereClause#merge to same named columns on diff tables"	2016-01-12 15:48:00 -07:00
rails/generators	correctly presence check of application_record.rb in plugin	2016-01-02 14:44:50 +09:00
active_record.rb	Merge pull request #22967 from schneems/schneems/generic-metadata	2016-01-08 13:42:48 -07:00