aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2011-09-13 19:40:47 -0500
committerGuillermo Iguaran <guilleiguaran@gmail.com>2011-09-13 19:40:47 -0500
commitfae70cb6bcfa3fbe7c850c7aeab2b40435926793 (patch)
tree58a68c315e96f6547035856a400d27d8834087ca
parent410b0ec1b712ce34f0fafb6505876d21e8007db7 (diff)
downloadrails-fae70cb6bcfa3fbe7c850c7aeab2b40435926793.tar.gz
rails-fae70cb6bcfa3fbe7c850c7aeab2b40435926793.tar.bz2
rails-fae70cb6bcfa3fbe7c850c7aeab2b40435926793.zip
Add missing changelog entries for actionpack
-rw-r--r--actionpack/CHANGELOG4
1 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index d55064bf6d..d01422b314 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -48,8 +48,12 @@
*Rails 3.1.1 (unreleased)*
+* Don't mount Sprockets server at config.assets.prefix if config.assets.compile is false. [Mark J. Titorenko]
+
* Set relative url root in assets when controller isn't available for Sprockets (eg. Sass files using asset_path). Fixes #2435 [Guillermo Iguaran]
+* Fix basic auth credential generation to not make newlines. GH #2882
+
* Fixed the behavior of asset pipeline when config.assets.digest and config.assets.compile are false and requested asset isn't precompiled.
Before the requested asset were compiled anyway ignoring that the config.assets.compile flag is false. [Guillermo Iguaran]