diff options
| author | Rizwan Reza <rizwanreza@gmail.com> | 2010-03-28 12:04:00 +0430 |
|---|---|---|
| committer | Rizwan Reza <rizwanreza@gmail.com> | 2010-03-28 12:04:00 +0430 |
| commit | b4c91de9462f59d6395c7c871aafa3301afdc383 (patch) | |
| tree | fadcaf603a6f473e8ccd52070a1f3b4f957c34cb /load_paths.rb | |
| parent | 4b4f69b9bfbd33556e23262f57cf6d944dfd9f63 (diff) | |
| parent | 66d57d7ba83df52ff1e0485c89f6192c2f84c6b8 (diff) | |
| download | rails-b4c91de9462f59d6395c7c871aafa3301afdc383.tar.gz rails-b4c91de9462f59d6395c7c871aafa3301afdc383.tar.bz2 rails-b4c91de9462f59d6395c7c871aafa3301afdc383.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'load_paths.rb')
| -rw-r--r-- | load_paths.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/load_paths.rb b/load_paths.rb index b87e0d7235..873315f978 100644 --- a/load_paths.rb +++ b/load_paths.rb @@ -2,7 +2,13 @@ begin require File.expand_path('../.bundle/environment', __FILE__) rescue LoadError begin - require 'rubygems' + # bust gem prelude + if defined? Gem + Gem.cache + gem 'bundler' + else + require 'rubygems' + end require 'bundler' Bundler.setup rescue LoadError |