Skip to content
Browse files

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...
1 parent d963ef9 commit 20aff013f14e7d4e50908a38ffb0e1ddda094fba @joshk joshk committed with fxn Jul 17, 2011
Showing with 1 addition and 6 deletions.
  1. +1 −6 load_paths.rb
View
7 load_paths.rb
@@ -1,9 +1,4 @@
# bust gem prelude
-if defined? Gem
- Gem.source_index
- gem 'bundler'
-else
- require 'rubygems'
-end
+require 'rubygems' unless defined? Gem
require 'bundler'
Bundler.setup

0 comments on commit 20aff01

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