diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2013-03-08 02:35:06 -0800 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2013-03-08 02:35:06 -0800 |
| commit | f1082b8588a9144eedb34d511f0074031f692d98 (patch) | |
| tree | c7771c73870a8afe49b5e2d2b0e21b0f2db85a47 /activerecord/CHANGELOG.md | |
| parent | b67043393b5ed6079989513299fe303ec3bc133b (diff) | |
| parent | cd26b6ae7c1546ef8f38302661bbedf8cb487311 (diff) | |
| download | rails-f1082b8588a9144eedb34d511f0074031f692d98.tar.gz rails-f1082b8588a9144eedb34d511f0074031f692d98.tar.bz2 rails-f1082b8588a9144eedb34d511f0074031f692d98.zip | |
Merge pull request #9553 from neerajdotname/7365-mergin-scopes-and-where
7365 merging scopes for where clauses
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 3b140b9ec3..ae5ef5c7d7 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,5 +1,11 @@ ## Rails 4.0.0 (unreleased) ## +* Previously `Post.active.inactive` used to result in `Post.inactive` + since the last where clause used to win while combining scopes. + Now all the scopes will be merged using `AND`. Fixes #7365 . + + *Neeraj Singh* and *Jon Leighton* + * Expand `#cache_key` to consult all relevant updated timestamps. Previously only `updated_at` column was checked, now it will |