From ef74ad8e0c0a1c46f7e8983e9d5460dea9bec95e Mon Sep 17 00:00:00 2001 From: Ryan Bigg Date: Mon, 11 Oct 2010 13:28:50 +1100 Subject: Remove mention to register_javascript_include_default in documentation --- actionpack/lib/action_view/helpers/asset_tag_helper.rb | 3 --- 1 file changed, 3 deletions(-) (limited to 'actionpack') diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb index c1dfbe5dc3..b97c73aff9 100644 --- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb @@ -292,9 +292,6 @@ module ActionView # # * = The application.js file is only referenced if it exists # - # Though it's not really recommended practice, if you need to extend the default JavaScript set for any reason - # (e.g., you're going to be using a certain .js file in every action), then take a look at the register_javascript_include_default method. - # # You can also include all javascripts in the +javascripts+ directory using :all as the source: # # javascript_include_tag :all # => -- cgit v1.2.3 From 234a4ca7ddb7794a92f266af48fd38edbdb03003 Mon Sep 17 00:00:00 2001 From: Ryan Bigg Date: Mon, 11 Oct 2010 13:32:04 +1100 Subject: Add missing CHANGELOG entry about reset_javascript_include_default --- actionpack/CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) (limited to 'actionpack') diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 6352b97a6b..966d1ae47d 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -33,6 +33,8 @@ * 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 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(-) (limited to 'actionpack') 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