diff options
author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-01-10 19:04:48 -0200 |
---|---|---|
committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-01-10 19:04:57 -0200 |
commit | d564ee06a8430df809397a64e2d5f9d797be7106 (patch) | |
tree | 6643a9a0062c13b9116027756055ca8b591756fa /actionpack | |
parent | 686307cd90cd2153f73bd60a3810411584d3f6d3 (diff) | |
download | rails-d564ee06a8430df809397a64e2d5f9d797be7106.tar.gz rails-d564ee06a8430df809397a64e2d5f9d797be7106.tar.bz2 rails-d564ee06a8430df809397a64e2d5f9d797be7106.zip |
Reorder AP changelog and remove duplicated entry [ci skip]
Duplicated entry added in 002dfba66490d289bac897d1ba886310a672e779.
Diffstat (limited to 'actionpack')
-rw-r--r-- | actionpack/CHANGELOG.md | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index faa33f2992..9a53d6fcf9 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,17 +1,19 @@ ## Rails 3.2.12 (unreleased) ## -* Bump `rack` dependency to 1.4.3, eliminate `Rack::File` headers deprecation warning. +* Prevent unnecessary asset compilation when using `javascript_include_tag` on + files with non-standard extensions. - *Sam Ruby + Carlos Antonio da Silva* + *Noah Silas* -* Do not append second slash to `root_url` when using `trailing_slash: true` +* Fixes issue where duplicate assets can be required with sprockets. -* Prevent unnecessary asset compilation when using javascript_include_tag on - files with non-standard extensions. + *Jeremy Jackson* - *Noah Silas* +* Bump `rack` dependency to 1.4.3, eliminate `Rack::File` headers deprecation warning. + + *Sam Ruby + Carlos Antonio da Silva* -* Do not append second slash to root_url when using `trailing_slash: true` +* Do not append second slash to `root_url` when using `trailing_slash: true` Fix #8700. Backport #8701. @@ -25,10 +27,6 @@ *Yves Senn* -* Fixes issue where duplicate assets can be required with sprockets. - - *Jeremy Jackson* - * Fix a bug in `content_tag_for` that prevents it for work without a block. *Jasl* |