1 files changed, 16 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 33d2793ffc..a844d1d8d7 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,5 +1,21 @@
 ## Rails 6.0.0.alpha (Unreleased) ##
 
+*   `String#strip_heredoc` preserves frozenness.
+
+        "foo".freeze.strip_heredoc.frozen?  # => true
+
+    Fixes that frozen string literals would inadvertently become unfrozen:
+
+        # frozen_string_literal: true
+
+        foo = <<-MSG.strip_heredoc
+          la la la
+        MSG
+
+        foo.frozen?  # => false !??
+
+    *Jeremy Daer*
+
 *   Rails 6 requires Ruby 2.4.1 or newer.
 
     *Jeremy Daer*