diff options
| author | José Valim <jose.valim@gmail.com> | 2011-04-15 18:13:17 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-04-15 18:43:21 +0200 |
| commit | ae13cb1523b97e860e7a8eeec905528a273d843a (patch) | |
| tree | 300d20ee9cc29652eda688ca3c91e02b001b814b | |
| parent | 7dea4b57a48e1bef70bcd8ae9a804bce09865bae (diff) | |
| download | rails-ae13cb1523b97e860e7a8eeec905528a273d843a.tar.gz rails-ae13cb1523b97e860e7a8eeec905528a273d843a.tar.bz2 rails-ae13cb1523b97e860e7a8eeec905528a273d843a.zip | |
Remove rescue as it was clobbering the real error.
| -rw-r--r-- | load_paths.rb | 39 |
1 files changed, 8 insertions, 31 deletions
diff --git a/load_paths.rb b/load_paths.rb index 8f37364629..15345e31e3 100644 --- a/load_paths.rb +++ b/load_paths.rb @@ -1,32 +1,9 @@ -begin - require File.expand_path('../.bundle/environment', __FILE__) -rescue LoadError - begin - # bust gem prelude - if defined? Gem - Gem.source_index - gem 'bundler' - else - require 'rubygems' - end - require 'bundler' - Bundler.setup - rescue LoadError - module Bundler - def self.require(*args, &block); end - def self.method_missing(*args, &block); end - end - - %w( - actionmailer - actionpack - activemodel - activerecord - activeresource - activesupport - railties - ).each do |framework| - $:.unshift File.expand_path("../#{framework}/lib", __FILE__) - end - end +# bust gem prelude +if defined? Gem + Gem.source_index + gem 'bundler' +else + require 'rubygems' end +require 'bundler' +Bundler.setup
\ No newline at end of file |