diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2014-11-24 14:55:34 -0200 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2014-11-24 14:55:34 -0200 |
| commit | e3acd74fa8cbe5c09321ee75dd387e9d8cb044fc (patch) | |
| tree | 03b48edff010244ca9f7f54588a1cd8ffdfe23f7 /activerecord/CHANGELOG.md | |
| parent | 33c80cb69e183abb1212de0851565ef7f1c48cc4 (diff) | |
| parent | 91e3dab804fffe0b1daebb438091418faa1fa256 (diff) | |
| download | rails-e3acd74fa8cbe5c09321ee75dd387e9d8cb044fc.tar.gz rails-e3acd74fa8cbe5c09321ee75dd387e9d8cb044fc.tar.bz2 rails-e3acd74fa8cbe5c09321ee75dd387e9d8cb044fc.zip | |
Merge pull request #17678 from siddharth28/includes_with_scope_with_joins
Fix includes on association with a scope
Diffstat (limited to 'activerecord/CHANGELOG.md')
| -rw-r--r-- | activerecord/CHANGELOG.md | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index a4de332d4c..9130cfbe9e 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -14,6 +14,12 @@ *Yves Senn* +* Fix includes on association with a scope containing joins along with conditions + on the joined assoiciation. + + *Siddharth Sharma* + + * Add `Table#name` to match `TableDefinition#name`. *Cody Cutrer* |