From de3603c2552df3d7bb37be2d810aa719fbf7b94f Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Tue, 19 Oct 2010 10:13:26 +0200
Subject: [PATCH] adds the new :data idiom in tag helpers to the CHANGELOG

---
 actionpack/CHANGELOG | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 9eaa0eb605946..2d133ca0b24e7 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,12 @@
 *Rails 3.1.0 (unreleased)*
 
+* Added a convenience idiom to generate HTML5 data-* attributes in tag helpers from a :data hash of options:
+
+    tag("div", :data => {:name => 'Stephen', :city_state => %w(Chicago IL)})
+    # => <div data-name="Stephen" data-city-state="[&quot;Chicago&quot;,&quot;IL&quot;]" />
+
+  Keys are dasherized. Values are JSON-encoded, except for strings and symbols. [Stephen Celis]
+
 * Added render :once. You can pass either a string or an array of strings and Rails will ensure they each of them are rendered just once. [José Valim]
 
 * Deprecate old template handler API. The new API simply requires a template handler to respond to call. [José Valim]