From e6f0c24bc3bd03db725e840fa8949f4dbb1e0a72 Mon Sep 17 00:00:00 2001
From: Josh Kalderimis <josh.kalderimis@gmail.com>
Date: Sun, 17 Jul 2011 15:21:19 +0200
Subject: 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.
---
 load_paths.rb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/load_paths.rb b/load_paths.rb
index 590af69330..17f5ce180d 100644
--- a/load_paths.rb
+++ b/load_paths.rb
@@ -1,8 +1,4 @@
 # bust gem prelude
-if defined? Gem
-  gem 'bundler'
-else
-  require 'rubygems'
-end
+require 'rubygems' unless defined? Gem
 require 'bundler'
-Bundler.setup
+Bundler.setup
\ No newline at end of file
-- 
cgit v1.2.3