From ca378659bcaa41f5bd231b6792bf50c941e7fd12 Mon Sep 17 00:00:00 2001
From: Andre Arko <andre@arko.net>
Date: Mon, 12 Apr 2010 15:09:40 -0700
Subject: [PATCH] Update the Bundler snippet for 0.9.15 and above

---
 rails.gemspec                                  |  4 ++--
 .../rails/app/templates/config/boot.rb         | 18 +++++-------------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/rails.gemspec b/rails.gemspec
index 9c3204242f..ca0ec36cc5 100644
--- a/rails.gemspec
+++ b/rails.gemspec
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.email             = 'david@loudthinking.com'
   s.homepage          = 'http://www.rubyonrails.org'
   s.rubyforge_project = 'rails'
-  
+
   s.files = []
   s.require_path = []
 
@@ -24,5 +24,5 @@ Gem::Specification.new do |s|
   s.add_dependency('activeresource', version)
   s.add_dependency('actionmailer',   version)
   s.add_dependency('railties',       version)
-  s.add_dependency('bundler',        '>= 0.9.14')
+  s.add_dependency('bundler',        '>= 0.9.19')
 end
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