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 20aff013f14e7d4e50908a38ffb0e1ddda094fba 1 parent d963ef9
Josh Kalderimis authored July 17, 2011 fxn committed July 18, 2011

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

  1. 7  load_paths.rb
7  load_paths.rb
... ...
@@ -1,9 +1,4 @@
1 1
 # bust gem prelude
2  
-if defined? Gem
3  
-  Gem.source_index
4  
-  gem 'bundler'
5  
-else
6  
-  require 'rubygems'
7  
-end
  2
+require 'rubygems' unless defined? Gem
8 3
 require 'bundler'
9 4
 Bundler.setup

0 notes on commit 20aff01

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