From ae13cb1523b97e860e7a8eeec905528a273d843a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 15 Apr 2011 18:13:17 +0200
Subject: [PATCH] Remove rescue as it was clobbering the real error.

---
 load_paths.rb | 39 ++++++++-------------------------------
 1 file 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