From fc7f3daeb603020e6bd180b7065ada7a02625c09 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Mon, 8 Oct 2012 17:49:46 +0200 Subject: Everyone is running bundler, no need for defensive programming shit --- .../lib/rails/generators/rails/app/templates/config/application.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'railties/lib/rails') 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 ed4c0e6a95..bfb2e507ae 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/application.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb @@ -11,8 +11,8 @@ require "action_mailer/railtie" <%= comment_if :skip_test_unit %>require "rails/test_unit/railtie" <% end -%> -# Assume that assets are precompiled for production -Bundler.require(*Rails.groups(assets: %w(development test))) if defined?(Bundler) +# Assets should be precompiled for production (so we don't need the gems loaded then) +Bundler.require(*Rails.groups(assets: %w(development test))) module <%= app_const_base %> class Application < Rails::Application -- cgit v1.2.3