aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorGeorge Claghorn <george@basecamp.com>2019-07-22 12:24:37 -0400
committerGeorge Claghorn <george@basecamp.com>2019-07-22 12:24:37 -0400
commit3b36d75c8fef2e8d3bc9db87486729d4e8229840 (patch)
tree8fdc9c9cb945b8513a16f2ff904700905e38eed1 /activesupport
parentfb08b7ed2112d2f5b1da74dd9317df17d105992f (diff)
downloadrails-3b36d75c8fef2e8d3bc9db87486729d4e8229840.tar.gz
rails-3b36d75c8fef2e8d3bc9db87486729d4e8229840.tar.bz2
rails-3b36d75c8fef2e8d3bc9db87486729d4e8229840.zip
Remove changelog entry for backported change
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/CHANGELOG.md7
1 files changed, 0 insertions, 7 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 1776972dd7..24f253fa92 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,10 +1,3 @@
-* 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.