diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-09-11 12:18:57 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-09-11 12:18:57 -0700 |
| commit | 2a0f2603d18064a1997b5c31a07b0e17edb1fbf5 (patch) | |
| tree | 09a618fc4c80e5dff3215b81e7ede5144a8b52dc /activerecord/CHANGELOG.md | |
| parent | 802876854d23e7735c8647e0a7b90440db095d8a (diff) | |
| parent | 5cbed2bc606750c71ee231d2b816471fe241459e (diff) | |
| download | rails-2a0f2603d18064a1997b5c31a07b0e17edb1fbf5.tar.gz rails-2a0f2603d18064a1997b5c31a07b0e17edb1fbf5.tar.bz2 rails-2a0f2603d18064a1997b5c31a07b0e17edb1fbf5.zip | |
Merge pull request #12194 from thedarkone/readonly-merger-fix
Relation#merge should not lose readonly(false) flag.
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* |