Skip to content
This repository
Browse code

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
  • Loading branch information...
commit 9ade5870023a427433737325005d47f600105a3a 1 parent a6139b9
Josh Kalderimis authored July 17, 2011 fxn committed July 18, 2011

Showing 1 changed file with 1 addition and 7 deletions. Show diff stats Hide diff stats

  1. 8  load_paths.rb
8  load_paths.rb
@@ -2,13 +2,7 @@
2 2
   require File.expand_path('../.bundle/environment', __FILE__)
3 3
 rescue LoadError
4 4
   begin
5  
-    # bust gem prelude
6  
-    if defined? Gem
7  
-      Gem.source_index
8  
-      gem 'bundler'
9  
-    else
10  
-      require 'rubygems'
11  
-    end
  5
+    require 'rubygems' unless defined? Gem
12 6
     require 'bundler'
13 7
     Bundler.setup
14 8
   rescue LoadError

0 notes on commit 9ade587

Please sign in to comment.
Something went wrong with that request. Please try again.