From e6b45b8111cc375be57a1e1ca2b2b47eb21a2e01 Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Mon, 11 Oct 2010 12:00:37 +0200 Subject: Revert "Add missing CHANGELOG entry about reset_javascript_include_default" This reverts commit 234a4ca7ddb7794a92f266af48fd38edbdb03003. Reason: No big deal Ryan, only there's a very strict policy in docrails which allows public write access on the other hand. CHANGELOGs can only be edited in master. If this is added I'll make sure you get the credit for the patch. --- actionpack/CHANGELOG | 2 -- 1 file changed, 2 deletions(-) diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 966d1ae47d..6352b97a6b 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -33,8 +33,6 @@ * Upgrade to Rack 1.2.1 [Jeremy Kemper] -* Removed reset_javascript_include_default, use config.action_view.javascript_expansions in config/application.rb for this instead [José Valim] - * Allow :path to be given to match/get/post/put/delete instead of :path_names in the new router [Carlos Antônio da Silva] * Added resources_path_names to the new router DSL [José Valim] -- cgit v1.2.3