aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2011-05-24 07:45:54 -0500
committerDavid Heinemeier Hansson <david@loudthinking.com>2011-05-24 07:45:54 -0500
commit67e12eb3780cb1265671406ff742a0b0cd0d82b4 (patch)
tree73946b1c62e8e6b72d20914137be93c5b1ea833c /railties/lib/rails
parentdac68cb92265d2ff5d83560e8cd53ce17098aa30 (diff)
downloadrails-67e12eb3780cb1265671406ff742a0b0cd0d82b4.tar.gz
rails-67e12eb3780cb1265671406ff742a0b0cd0d82b4.tar.bz2
rails-67e12eb3780cb1265671406ff742a0b0cd0d82b4.zip
The asset pipeline is always on for new apps, dont need the legacy js ext stuff
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/application.rb11
1 files changed, 0 insertions, 11 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb
index 8ff80c6fd3..a097c77391 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/application.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -39,17 +39,6 @@ module <%= app_const_base %>
# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
# config.i18n.default_locale = :de
- # Please note that JavaScript expansions are *ignored altogether* if the asset
- # pipeline is enabled (see config.assets.enabled below). Put your defaults in
- # app/assets/javascripts/application.js in that case.
- #
- # JavaScript files you want as :defaults (application.js is always included).
-<% if options[:skip_javascript] -%>
- # config.action_view.javascript_expansions[:defaults] = %w()
-<% else -%>
- # config.action_view.javascript_expansions[:defaults] = %w(prototype prototype_ujs)
-<% end -%>
-
# Configure the default encoding used in templates for Ruby 1.9.
config.encoding = "utf-8"