diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2011-09-14 00:58:44 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-09-14 00:58:44 -0700 |
| commit | 425362da31db52dfc50d4e25d6ecf2fea1353a4e (patch) | |
| tree | 86783d7adeedab7325739154b354a03c3657880f | |
| parent | 0d48b3afa98375cf71ea0ad731eaac6c309fbb57 (diff) | |
| parent | fae70cb6bcfa3fbe7c850c7aeab2b40435926793 (diff) | |
| download | rails-425362da31db52dfc50d4e25d6ecf2fea1353a4e.tar.gz rails-425362da31db52dfc50d4e25d6ecf2fea1353a4e.tar.bz2 rails-425362da31db52dfc50d4e25d6ecf2fea1353a4e.zip | |
Merge pull request #3012 from guilleiguaran/3-1-1-changelogs
Add missing changelog entries for actionpack
| -rw-r--r-- | actionpack/CHANGELOG | 4 |
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] |