diff options
| author | Josh Kalderimis <josh.kalderimis@gmail.com> | 2011-07-17 15:21:19 +0200 |
|---|---|---|
| committer | Josh Kalderimis <josh.kalderimis@gmail.com> | 2011-07-17 15:21:19 +0200 |
| commit | e6f0c24bc3bd03db725e840fa8949f4dbb1e0a72 (patch) | |
| tree | 60d2bd3c3323ce33723aef11af3c4ca53066be17 /load_paths.rb | |
| parent | d664eba5b42d5a4cf8acb4f198796c194a662414 (diff) | |
| download | rails-e6f0c24bc3bd03db725e840fa8949f4dbb1e0a72.tar.gz rails-e6f0c24bc3bd03db725e840fa8949f4dbb1e0a72.tar.bz2 rails-e6f0c24bc3bd03db725e840fa8949f4dbb1e0a72.zip | |
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.
Diffstat (limited to 'load_paths.rb')
| -rw-r--r-- | load_paths.rb | 8 |
1 files 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 |