Fix association with scope including joins #29413
kamipo wants to merge
kamipo:fix_association_with_scope_including_joins
into rails:master
kamipo:fix_association_with_scope_including_joins
into rails:master