diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2010-10-14 10:25:43 +0100 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2010-10-14 10:25:43 +0100 |
| commit | 3fb493c2b037ffbdda5c91d66334ec6f79faa2d1 (patch) | |
| tree | e49b072103bbfe6fb6159954c786a31f44099325 /railties/lib/rails/generators/rails/app/templates/config/application.rb | |
| parent | 212fdd8ba9624f61421a7a950283537a3d39ac18 (diff) | |
| parent | 01ab6f961bff150d50c99f03fa3946f48ac29b17 (diff) | |
| download | rails-3fb493c2b037ffbdda5c91d66334ec6f79faa2d1.tar.gz rails-3fb493c2b037ffbdda5c91d66334ec6f79faa2d1.tar.bz2 rails-3fb493c2b037ffbdda5c91d66334ec6f79faa2d1.zip | |
Merge branch 'master' into nested_has_many_through
Conflicts:
activerecord/lib/active_record/associations.rb
activerecord/test/cases/associations/cascaded_eager_loading_test.rb
Diffstat (limited to 'railties/lib/rails/generators/rails/app/templates/config/application.rb')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/application.rb | 4 |
1 files changed, 3 insertions, 1 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 7d63e99e05..00a23a7b89 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/application.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb @@ -40,8 +40,10 @@ module <%= app_const_base %> # config.i18n.default_locale = :de # JavaScript files you want as :defaults (application.js is always included). -<% if options[:skip_prototype] -%> +<% if options[:skip_javascript] -%> config.action_view.javascript_expansions[:defaults] = %w() +<% elsif options[:javascript] == 'jquery' -%> + config.action_view.javascript_expansions[:defaults] = %w(jquery rails) <% else -%> # config.action_view.javascript_expansions[:defaults] = %w(jquery rails) <% end -%> |