From b7d80b95d800b908d00327ded7c36c30feeb6525 Mon Sep 17 00:00:00 2001
From: Chad Wilson <29788154+chadlwilson@users.noreply.github.com>
Date: Tue, 21 Apr 2026 22:07:19 +0800
Subject: [PATCH] chore: forward-port NEWS/changelog entries

Consolidates changelog entries from earlier ruby branches
- 93450765b5319cfb552a3d9719df137e8fbb75e9
- 6a2e4a76d352127135359e3420d5f42b767a0600
- b6be29fd0e0f5089447d2f8d18140ae78258621d
---
 NEWS.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/NEWS.md b/NEWS.md
index c1031bf..3f3e364 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -12,6 +12,10 @@
 
 * Freeze `src` in `ERB#initialize` for Ractor compatibility https://github.com/ruby/erb/pull/105
 
+## 6.0.1.1
+
+* Prohibit `def_method` on marshal-loaded ERB instances
+
 ## 6.0.1
 
 * Freeze `ERB::Compiler::TrimScanner::ERB_STAG` for Ractor compatibility
@@ -55,10 +59,18 @@
 * Drop `cgi` from runtime dependencies [#59](https://github.com/ruby/erb/pull/59)
 * Make `ERB::VERSION` public
 
+## 4.0.4.1
+
+* Prohibit `def_method` on marshal-loaded ERB instances
+
 ## 4.0.4
 
 * Skip building the C extension for JRuby [#52](https://github.com/ruby/erb/pull/52)
 
+## 4.0.3.1
+
+* Prohibit `def_method` on marshal-loaded ERB instances
+
 ## 4.0.3
 
 * Enable `frozen_string_literal` in all files [#49](https://github.com/ruby/erb/pull/49)