This fixes an issue when bundling to a local path (eg. /vendor/bundle).

If you bundle to a local path bundler is not included in it, so calling "gem 'bundler'" will fail. Conflicts: load_paths.rb
rails · Jul 18, 2011 · 9ade587 · 9ade587
1 parent a6139b9
commit 9ade587
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/load_paths.rb b/load_paths.rb
@@ -2,13 +2,7 @@
   require File.expand_path('../.bundle/environment', __FILE__)
 rescue LoadError
   begin
-    # bust gem prelude
-    if defined? Gem
-      Gem.source_index
-      gem 'bundler'
-    else
-      require 'rubygems'
-    end
+    require 'rubygems' unless defined? Gem
     require 'bundler'
     Bundler.setup
   rescue LoadError