aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/models/company.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-09-16 13:45:25 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-09-16 13:45:25 -0300
commitae297710dd526a95bae99bd143e2bb185466cc23 (patch)
tree0114e070dbd19a6efd8dc19f611b1816bbd4f643 /activerecord/test/models/company.rb
parent678fdda54f391a7fec92e2c0d2a94b6e889c220c (diff)
parentfbbb6c87fd5e8fcd913c0dbf518024edd7538072 (diff)
downloadrails-ae297710dd526a95bae99bd143e2bb185466cc23.tar.gz
rails-ae297710dd526a95bae99bd143e2bb185466cc23.tar.bz2
rails-ae297710dd526a95bae99bd143e2bb185466cc23.zip
Merge pull request #12011 from jetthoughts/11963_fix_join_with_association_scope
Collapse where constraints to the Arel::Nodes::And node Conflicts: activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord/test/models/company.rb')
0 files changed, 0 insertions, 0 deletions