diff options
author | Gonçalo Silva <goncalossilva@gmail.com> | 2011-03-24 17:21:17 +0000 |
---|---|---|
committer | Gonçalo Silva <goncalossilva@gmail.com> | 2011-03-24 17:21:17 +0000 |
commit | 9887f238871bb2dd73de6ce8855615bcc5d8d079 (patch) | |
tree | 74fa9ff9524a51701cfa23f708b3f777c65b7fe5 /load_paths.rb | |
parent | aff821508a16245ebc03510ba29c70379718dfb7 (diff) | |
parent | 5214e73850916de3c9127d35a4ecee0424d364a3 (diff) | |
download | rails-9887f238871bb2dd73de6ce8855615bcc5d8d079.tar.gz rails-9887f238871bb2dd73de6ce8855615bcc5d8d079.tar.bz2 rails-9887f238871bb2dd73de6ce8855615bcc5d8d079.zip |
Merge branch 'master' of https://github.com/rails/rails
Diffstat (limited to 'load_paths.rb')
-rw-r--r-- | load_paths.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/load_paths.rb b/load_paths.rb index 873315f978..8f37364629 100644 --- a/load_paths.rb +++ b/load_paths.rb @@ -4,7 +4,7 @@ rescue LoadError begin # bust gem prelude if defined? Gem - Gem.cache + Gem.source_index gem 'bundler' else require 'rubygems' |