aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/CHANGELOG.md
diff options
context:
space:
mode:
authorGeorge Claghorn <george@basecamp.com>2019-07-22 12:19:00 -0400
committerGitHub <noreply@github.com>2019-07-22 12:19:00 -0400
commit2af445c3118f7f22b8c28bf2287b193a647bbb10 (patch)
tree6a2d3bce2facb164321fa71aca52007fdfe5e45f /activesupport/CHANGELOG.md
parent9ad806887096be1f60019a6b301a4c84aa1d8e65 (diff)
parent722c45f64110be876d83e7f9a22592aa954886c1 (diff)
downloadrails-2af445c3118f7f22b8c28bf2287b193a647bbb10.tar.gz
rails-2af445c3118f7f22b8c28bf2287b193a647bbb10.tar.bz2
rails-2af445c3118f7f22b8c28bf2287b193a647bbb10.zip
Merge pull request #36623 from alipman88/exclude_marshal_dump_from_delegate_missing_to
Exclude marshal_dump & _dump methods from being delegated via delegate_missing_to extension, fix #36522
Diffstat (limited to 'activesupport/CHANGELOG.md')
-rw-r--r--activesupport/CHANGELOG.md11
1 files changed, 9 insertions, 2 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index d56d4c22de..1776972dd7 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,5 +1,12 @@
-* Allow the `on_rotation` proc used when decrypting/verifying a message to be
- passed at the constructor level.
+* Do not delegate missing `marshal_dump` and `_dump` methods via the
+ `delegate_missing_to` extension. This avoids unintentionally adding instance
+ variables when calling `Marshal.dump(object)`, should the delegation target of
+ `object` be a method which would otherwise add them. Fixes #36522.
+
+ *Aaron Lipman*
+
+* Allow the on_rotation proc used when decrypting/verifying a message to be
+ be passed at the constructor level.
Before: