From 5c07c33ab4de037aeb1f6cc6817fddd28f9a35d2 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Thu, 4 Feb 2010 09:28:41 -0800 Subject: Move framework requires and Bundler.require from boot.rb to app.rb. Cut down the list of railtie choices to those that make sense. --- .../generators/rails/app/templates/config/application.rb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'railties/lib/generators/rails/app/templates/config/application.rb') diff --git a/railties/lib/generators/rails/app/templates/config/application.rb b/railties/lib/generators/rails/app/templates/config/application.rb index 78a355d2f4..2872d187ba 100644 --- a/railties/lib/generators/rails/app/templates/config/application.rb +++ b/railties/lib/generators/rails/app/templates/config/application.rb @@ -1,5 +1,19 @@ require File.expand_path('../boot', __FILE__) +<% unless options[:skip_activerecord] -%> +require 'rails/all' +<% else -%> +# Pick the frameworks you want: +# require "active_record/railtie" +require "action_controller/railtie" +require "action_mailer/railtie" +require "active_resource/railtie" +require "rails/test_unit/railtie" +<% end -%> + +# Auto-require all bundled libraries. +Bundler.require + module <%= app_const_base %> class Application < Rails::Application # Settings in config/environments/* take precedence over those specified here. -- cgit v1.2.3 From a74ed0c2eef87d7fd159d9ac294ced33f4b10bfc Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Thu, 4 Feb 2010 11:04:50 -0800 Subject: Autorequire default libs and those in groups named after the current Rails environment --- railties/lib/generators/rails/app/templates/config/application.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'railties/lib/generators/rails/app/templates/config/application.rb') diff --git a/railties/lib/generators/rails/app/templates/config/application.rb b/railties/lib/generators/rails/app/templates/config/application.rb index 2872d187ba..7c555c2542 100644 --- a/railties/lib/generators/rails/app/templates/config/application.rb +++ b/railties/lib/generators/rails/app/templates/config/application.rb @@ -11,8 +11,8 @@ require "active_resource/railtie" require "rails/test_unit/railtie" <% end -%> -# Auto-require all bundled libraries. -Bundler.require +# Auto-require default libraries and those for the current Rails environment. +Bundler.require :default, Rails.env module <%= app_const_base %> class Application < Rails::Application -- cgit v1.2.3