diff options
| author | thedarkone <thedarkone2@gmail.com> | 2013-09-11 14:18:31 +0200 |
|---|---|---|
| committer | thedarkone <thedarkone2@gmail.com> | 2013-09-11 14:18:31 +0200 |
| commit | 5cbed2bc606750c71ee231d2b816471fe241459e (patch) | |
| tree | dac1c587f0cf6f6388ad91a83fa689e7e5d6b71a /activerecord/CHANGELOG.md | |
| parent | 05f88b7b0499781f87e9e79cbec4d01193db2352 (diff) | |
| download | rails-5cbed2bc606750c71ee231d2b816471fe241459e.tar.gz rails-5cbed2bc606750c71ee231d2b816471fe241459e.tar.bz2 rails-5cbed2bc606750c71ee231d2b816471fe241459e.zip | |
Relation#merge should not lose readonly(false) flag.
The original code ignores the `false` value because `false.blank? # => true`.
Diffstat (limited to 'activerecord/CHANGELOG.md')
| -rw-r--r-- | activerecord/CHANGELOG.md | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 9041f9d33b..d2f2c745a0 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,7 @@ +* Fix `AR::Relation#merge` sometimes failing to preserve `readonly(false)` flag. + + *thedarkone* + * Re-use `order` argument pre-processing for `reorder`. *Paul Nikitochkin* |