From 54c2c6de1769570ecc13ddfb733e80e1086a21ef Mon Sep 17 00:00:00 2001
From: Juan Broullon <juan.broullon@shopify.com>
Date: Tue, 3 Jul 2018 16:28:24 -0400
Subject: [PATCH] Add changelog entry for 42c3537 [ci skip]

---
 actionview/CHANGELOG.md | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md
index 26170dfa77..73ed11dc8f 100644
--- a/actionview/CHANGELOG.md
+++ b/actionview/CHANGELOG.md
@@ -1,3 +1,13 @@
+*   Mark arrays of translations as trusted safe by using the `_html` suffix. Example:
+
+        en:
+          foo_html:
+            - "One"
+            - "<strong>Two</strong>"
+            - "Three &#128075; &#128578;"
+
+    *Juan Broullon*
+
 *   Add `year_format` option to date_select tag. This option makes it possible to customize year
     names. Lambda should be passed to use this option.
 
@@ -5,7 +15,7 @@
 
         date_select('user_birthday', '', start_year: 1998, end_year: 2000, year_format: ->year { "Heisei #{year - 1988}" })
 
-    The HTML produced: 
+    The HTML produced:
 
         <select id="user_birthday__1i" name="user_birthday[(1i)]">
         <option value="1998">Heisei 10</option>