Merge pull request #7885 from guilleiguaran/railties-changelog

Add missing entry in CHANGELOG about config.assets.cache change
rails · Oct 9, 2012 · 0e6c70e · 0e6c70e
2 parents c95bdf7 + 9f3d864
commit 0e6c70e
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
@@ -1,9 +1,14 @@
 ## Rails 4.0.0 (unreleased) ##
 
+*   Set a different cache per environment for assets pipeline 
+    through `config.assets.cache`.
+
+    *Guillermo Iguaran*
+
 *   `Rails.public_path` now returns a Pathname object. *Prem Sichanugrist*
 
 *   Remove highly uncommon `config.assets.manifest` option for moving the manifest path.
-    This option is now unsupported in sprockets-rails. 
+    This option is now unsupported in sprockets-rails.
 
     *Guillermo Iguaran & Dmitry Vorotilin*
 
@@ -12,7 +17,7 @@
 
     *Guillermo Iguaran*
 
-*   Remove `config.active_record.whitelist_attributes` and 
+*   Remove `config.active_record.whitelist_attributes` and
     `config.active_record.mass_assignment_sanitizer` from new applications since
     MassAssignmentSecurity has been extracted from Rails.