Permalink
Browse files

Reorder AP changelog and remove duplicated entry [ci skip]

Duplicated entry added in 002dfba.
  • Loading branch information...
1 parent 686307c commit d564ee06a8430df809397a64e2d5f9d797be7106 @carlosantoniodasilva carlosantoniodasilva committed Jan 10, 2013
Showing with 9 additions and 11 deletions.
  1. +9 −11 actionpack/CHANGELOG.md
View
20 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*

0 comments on commit d564ee0

Please sign in to comment.