aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2011-09-01 03:12:13 -0500
committerGuillermo Iguaran <guilleiguaran@gmail.com>2011-09-01 03:12:13 -0500
commit5bb1c7acdc5c9566bd8ef89f5b651ecc84dc1150 (patch)
tree0e0d3261422b627af29253ed97e734efa4cac745
parent3ce3b5b1f1f92d79ee015d246a9f62a725eca5ca (diff)
downloadrails-5bb1c7acdc5c9566bd8ef89f5b651ecc84dc1150.tar.gz
rails-5bb1c7acdc5c9566bd8ef89f5b651ecc84dc1150.tar.bz2
rails-5bb1c7acdc5c9566bd8ef89f5b651ecc84dc1150.zip
Add missing changelog entries for 3.1.1
-rw-r--r--actionpack/CHANGELOG11
1 files changed, 10 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 6b654e149e..dd27325055 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -28,7 +28,16 @@
for your test you need to do it before the cookie jar is created.
-*Rails 3.1.0 (unreleased)*
+*Rails 3.1.1 (unreleased)*
+
+* Fixed AssetNotPrecompiled error raised when rake assets:precompile is compiling certain .erb files. [Guillermo Iguaran]
+
+* Manifest is correctly placed in assets path when default assets prefix is changed. [Guillermo Iguaran]
+
+* Fixed stylesheet_link_tag and javascript_include_tag to respect additional options passed by the users when debug is on. [Guillermo Iguaran]
+
+
+*Rails 3.1.0 (August 30, 2011)*
* Param values are `paramified` in controller tests. [David Chelimsky]