aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/CHANGELOG.md
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2014-06-13 08:45:23 +0930
committerMatthew Draper <matthew@trebex.net>2014-06-13 08:52:44 +0930
commit6857415187810f1289068a448268264d0cf0844f (patch)
treedcda70dc09680f967e20c60462563b29aa3c0a42 /actionview/CHANGELOG.md
parent4e009eec3dacf76d25f61402f86b2e474dadee8a (diff)
parentbcab3f20dac0fe993e5d31bf6acef28ec54e658b (diff)
downloadrails-6857415187810f1289068a448268264d0cf0844f.tar.gz
rails-6857415187810f1289068a448268264d0cf0844f.tar.bz2
rails-6857415187810f1289068a448268264d0cf0844f.zip
Merge pull request #15654 from pdg137/master
In tag helper, honor html_safe on arrays; also make safe_join more similar to Array.join
Diffstat (limited to 'actionview/CHANGELOG.md')
-rw-r--r--actionview/CHANGELOG.md10
1 files changed, 10 insertions, 0 deletions
diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md
index d13cc0c7a7..d825d3b627 100644
--- a/actionview/CHANGELOG.md
+++ b/actionview/CHANGELOG.md
@@ -1,3 +1,13 @@
+* Flatten the array parameter in `safe_join`, so it behaves consistently with
+ `Array#join`.
+
+ *Paul Grayson*
+
+* Honor `html_safe` on array elements in tag values, as we do for plain string
+ values.
+
+ *Paul Grayson*
+
* Add `ActionView::Template::Handler.unregister_template_handler`.
It performs the opposite of `ActionView::Template::Handler.register_template_handler`.