1 files changed, 29 insertions, 1 deletions
diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md
index c5bb8fe627..adbe8ac389 100644
--- a/actionview/CHANGELOG.md
+++ b/actionview/CHANGELOG.md
@@ -1,3 +1,31 @@
+*   Fix `current_page?` when the URL contains escaped characters and the
+    original URL is using the hexadecimal lowercased.
+
+    *Rafael Mendonça França*
+
+*   Fix `text_area` to behave like `text_field` when `nil` is given as
+    value.
+
+    Before:
+
+        f.text_field :field, value: nil #=> <input value="">
+        f.text_area :field, value: nil  #=> <textarea>value of field</textarea>
+
+    After:
+
+        f.text_area :field, value: nil  #=> <textarea></textarea>
+
+    *Joel Cogen*
+
+*   Element of the `grouped_options_for_select` can
+    optionally contain html attributes as the last element of the array.
+
+        grouped_options_for_select(
+          [["North America", [['United States','US'],"Canada"], data: { foo: 'bar' }]]
+        )
+
+    *Vasiliy Ermolovich*
+
 *   Fix default rendered format problem when calling `render` without :content_type option.
     It should return :html. Fix #11393.
 
@@ -13,7 +41,7 @@
     After:
 
         link_to(action: 'bar', controller: 'foo') { content_tag(:span, 'Example site') }
-        # => "<a href=\"/\"><span>Example site</span></a>"
+        # => "<a href=\"/foo/bar\"><span>Example site</span></a>"
 
     *Murahashi Sanemat Kenichi*