aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/CHANGELOG
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2010-11-09 20:56:41 +0100
committerXavier Noria <fxn@hashref.com>2010-11-09 20:56:41 +0100
commit41366cdec6003011e19971c1bcfb82949ff93a6e (patch)
treeeb3e9188163341045acd2243b3bc09923e2147af /actionpack/CHANGELOG
parent88a559d4148789474c6dbd216725c69fa18200a9 (diff)
downloadrails-41366cdec6003011e19971c1bcfb82949ff93a6e.tar.gz
rails-41366cdec6003011e19971c1bcfb82949ff93a6e.tar.bz2
rails-41366cdec6003011e19971c1bcfb82949ff93a6e.zip
syncs CHANGELOGs for 3.0.2 in 3-0-stable with the ones in master
Diffstat (limited to 'actionpack/CHANGELOG')
-rw-r--r--actionpack/CHANGELOG6
1 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index b94723c969..db02beee35 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,7 +1,5 @@
*Rails 3.1.0 (unreleased)*
-* The helper number_to_currency accepts a new :negative_format option to be able to configure how to render negative amounts. [Don Wilson]
-
* 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)})
@@ -25,6 +23,10 @@
* Add Rack::Cache to the default stack. Create a Rails store that delegates to the Rails cache, so by default, whatever caching layer you are using will be used for HTTP caching. Note that Rack::Cache will be used if you use #expires_in, #fresh_when or #stale with :public => true. Otherwise, the caching rules will apply to the browser only. [Yehuda Katz, Carl Lerche]
+*Rails 3.0.2 (unreleased)*
+
+* The helper number_to_currency accepts a new :negative_format option to be able to configure how to render negative amounts. [Don Wilson]
+
*Rails 3.0.1 (October 15, 2010)*
* No Changes, just a version bump.