diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-10-11 12:06:21 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-10-11 12:06:21 +0200 |
| commit | 21a92b8d01eed34a6b26adb51139f1c40467409e (patch) | |
| tree | fe9673e3018b79031511098a7abf4930aaa807ab /actionpack | |
| parent | a8b1780410a86be58ac0f341ae6b079800783fcf (diff) | |
| parent | e6b45b8111cc375be57a1e1ca2b2b47eb21a2e01 (diff) | |
| download | rails-21a92b8d01eed34a6b26adb51139f1c40467409e.tar.gz rails-21a92b8d01eed34a6b26adb51139f1c40467409e.tar.bz2 rails-21a92b8d01eed34a6b26adb51139f1c40467409e.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_view/helpers/asset_tag_helper.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb index 3ff80579e2..d0f91f6b71 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 <tt>:all</tt> as the source: # # javascript_include_tag :all # => |