aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2012-10-08 17:49:46 +0200
committerDavid Heinemeier Hansson <david@loudthinking.com>2012-10-08 17:49:46 +0200
commitfc7f3daeb603020e6bd180b7065ada7a02625c09 (patch)
treef877d459d0b92867b51949c80a75dacfa3a16630
parentd81e76ddd6038a55c647b119ad393404af978b94 (diff)
downloadrails-fc7f3daeb603020e6bd180b7065ada7a02625c09.tar.gz
rails-fc7f3daeb603020e6bd180b7065ada7a02625c09.tar.bz2
rails-fc7f3daeb603020e6bd180b7065ada7a02625c09.zip
Everyone is running bundler, no need for defensive programming shit
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/application.rb4
1 files changed, 2 insertions, 2 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 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