1 files changed, 31 insertions, 1 deletions
diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md
index 50ca64d536..a6f6ac78db 100644
--- a/actionview/CHANGELOG.md
+++ b/actionview/CHANGELOG.md
@@ -1,8 +1,38 @@
+* Take label values into account when doing I18n lookups for model attributes.
+
+    The following:
+
+        # form.html.erb
+        <%= form_for @post do |f| %>
+          <%= f.label :type, value: "long" %>
+        <% end %>
+
+        # en.yml
+        en:
+          activerecord:
+            attributes:
+              post/long: "Long-form Post"
+
+    Used to simply return "long", but now it will return "Long-form
+    Post".
+
+    *Joshua Cody*
+
+*   Change `asset_path` to use File.join to create proper paths:
+
+        https://some.host.com//assets/some.js
+
+    becomes
+
+        https://some.host.com/assets/some.js
+
+    *Peter Schröder*
+
 *   Change `favicon_link_tag` default mimetype from `image/vnd.microsoft.icon` to
     `image/x-icon`.
 
     Before:
-    
+
         #=> favicon_link_tag 'myicon.ico'
         <link href="/assets/myicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" />