From ca378659bcaa41f5bd231b6792bf50c941e7fd12 Mon Sep 17 00:00:00 2001 From: Andre Arko Date: Mon, 12 Apr 2010 15:09:40 -0700 Subject: Update the Bundler snippet for 0.9.15 and above --- .../generators/rails/app/templates/config/boot.rb | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'railties') diff --git a/railties/lib/rails/generators/rails/app/templates/config/boot.rb b/railties/lib/rails/generators/rails/app/templates/config/boot.rb index 3971a07012..712b0981e1 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/boot.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/boot.rb @@ -1,14 +1,6 @@ -# Use locked gems if present. -begin - require File.expand_path('../../.bundle/environment', __FILE__) - -rescue LoadError - # Otherwise, use RubyGems. - require 'rubygems' - - # And set up the gems listed in the Gemfile. - if File.exist?(File.expand_path('../../Gemfile', __FILE__)) - require 'bundler' - Bundler.setup - end +require 'rubygems' +# Set up gems listed in the Gemfile. +if File.exist?(File.expand_path('../../Gemfile', __FILE__)) + require 'bundler' + Bundler.setup end -- cgit v1.2.3