From 3b36d75c8fef2e8d3bc9db87486729d4e8229840 Mon Sep 17 00:00:00 2001
From: George Claghorn <george@basecamp.com>
Date: Mon, 22 Jul 2019 12:24:37 -0400
Subject: Remove changelog entry for backported change

---
 activesupport/CHANGELOG.md | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'activesupport')

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.
 
-- 
cgit v1.2.3