diff options
author | Xavier Noria <fxn@hashref.com> | 2010-07-16 21:54:13 +0200 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2010-07-16 21:54:13 +0200 |
commit | ef165b355d461dea476875c2f1b7bac18eee3046 (patch) | |
tree | c534eaf74af3bec1c741d99a8ecb23014f1b9f21 /railties/lib/rails | |
parent | 04ef434b21f2143c3bea330d6861eac3696666ea (diff) | |
download | rails-ef165b355d461dea476875c2f1b7bac18eee3046.tar.gz rails-ef165b355d461dea476875c2f1b7bac18eee3046.tar.bz2 rails-ef165b355d461dea476875c2f1b7bac18eee3046.zip |
minor pass to generated code in application.rb related to :defaults
Diffstat (limited to 'railties/lib/rails')
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/application.rb | 6 |
1 files changed, 3 insertions, 3 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 ad8f523c28..7a94d6e05c 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/application.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb @@ -22,7 +22,7 @@ module <%= app_const_base %> # -- all .rb files in that directory are automatically loaded. # Custom directories with classes and modules you want to be autoloadable. - # config.autoload_paths += %W( #{config.root}/extras ) + # config.autoload_paths += %W(#{config.root}/extras) # Only load the plugins named here, in the order given (default is alphabetical). # :all can be used as a placeholder for all plugins not explicitly named. @@ -39,9 +39,9 @@ module <%= app_const_base %> # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] # config.i18n.default_locale = :de - # Add your default javascripts + # JavaScript files you want as :defaults (application.js is always included). <% if options[:skip_prototype] -%> - config.action_view.javascript_expansions[:defaults] = [] + config.action_view.javascript_expansions[:defaults] = %w() <% else -%> # config.action_view.javascript_expansions[:defaults] = %w(jquery rails) <% end -%> |