1 files changed, 18 insertions, 0 deletions
diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md
index 8bd4e1e56c..e93745c3bf 100644
--- a/actionview/CHANGELOG.md
+++ b/actionview/CHANGELOG.md
@@ -1,3 +1,21 @@
+*   Render now accepts any keys for locals, including reserved words
+
+    Only locals with valid variable names get set directly. Others
+    will still be available in local_assigns.
+
+    Example of render with reserved words:
+
+    ```erb
+    <%= render "example", class: "text-center", message: "Hello world!" %>
+
+    <!-- _example.html.erb: -->
+    <%= tag.div class: local_assigns[:class] do %>
+      <p><%= message %></p>
+    <% end %>
+    ```
+
+    *Peter Schilling*, *Matthew Draper*
+
 *   Show cache hits and misses when rendering partials.
 
     Partials using the `cache` helper will show whether a render hit or missed