aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-09-01 01:20:18 -0700
committerJosé Valim <jose.valim@gmail.com>2011-09-01 01:20:18 -0700
commitb93c3606cb74b191b5dce38984fce3713836a7e1 (patch)
tree5940cffa2cdb98bb90de802cfe51cf3106ce56bc /actionpack
parent9af2b5eeaa33861ad9613fb2c23083e89234eea5 (diff)
parent5bb1c7acdc5c9566bd8ef89f5b651ecc84dc1150 (diff)
downloadrails-b93c3606cb74b191b5dce38984fce3713836a7e1.tar.gz
rails-b93c3606cb74b191b5dce38984fce3713836a7e1.tar.bz2
rails-b93c3606cb74b191b5dce38984fce3713836a7e1.zip
Merge pull request #2787 from guilleiguaran/changelogs-3-1-1-master
Add missing changelog entries for 3.1.1
Diffstat (limited to 'actionpack')
-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]