aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-04-29 22:14:22 +0200
committerXavier Noria <fxn@hashref.com>2011-04-29 22:14:34 +0200
commitcc35d5c9e7049e62517642daf67d756312c5a5d2 (patch)
tree18320e6523028c4aef883e9196fb855d1e236ac7 /railties
parent60c877c43baa588db277fb4eca317e2f7884be70 (diff)
downloadrails-cc35d5c9e7049e62517642daf67d756312c5a5d2.tar.gz
rails-cc35d5c9e7049e62517642daf67d756312c5a5d2.tar.bz2
rails-cc35d5c9e7049e62517642daf67d756312c5a5d2.zip
JavaScript expansions are ignored if the application uses the asset pipeline, warn the user
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/application.rb4
1 files changed, 4 insertions, 0 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 ff8e6e5f3e..6b2aa97faa 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/application.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -39,6 +39,10 @@ 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.asset.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()