aboutsummaryrefslogtreecommitdiffstats
path: root/activeresource/lib
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-09-02 21:10:29 +0200
committerJosé Valim <jose.valim@gmail.com>2010-09-02 21:11:03 +0200
commit599e46bf24419a429ee0bb0ea02afd48f47aa4ec (patch)
tree725252bd044bd41ec1952be7a65265576302dc2a /activeresource/lib
parent13d2a081645db873379668b6f21e449201b6b036 (diff)
downloadrails-599e46bf24419a429ee0bb0ea02afd48f47aa4ec.tar.gz
rails-599e46bf24419a429ee0bb0ea02afd48f47aa4ec.tar.bz2
rails-599e46bf24419a429ee0bb0ea02afd48f47aa4ec.zip
Revert "Setup explicit requires for files with exceptions. Removed them from autoloading."
Booting a new Rails application does not work after this commit [#5359 state:open] This reverts commit 38a421b34d0b414564e919f67d339fac067a56e6.
Diffstat (limited to 'activeresource/lib')
-rw-r--r--activeresource/lib/active_resource/connection.rb3
-rw-r--r--activeresource/lib/active_resource/exceptions.rb2
2 files changed, 1 insertions, 4 deletions
diff --git a/activeresource/lib/active_resource/connection.rb b/activeresource/lib/active_resource/connection.rb
index dd0be4775d..b7befe110d 100644
--- a/activeresource/lib/active_resource/connection.rb
+++ b/activeresource/lib/active_resource/connection.rb
@@ -1,9 +1,8 @@
+require 'active_support/core_ext/benchmark'
require 'net/https'
require 'date'
require 'time'
require 'uri'
-require 'active_support/core_ext/benchmark'
-require 'action_controller/metal/exceptions'
module ActiveResource
# Class to handle connections to remote web services.
diff --git a/activeresource/lib/active_resource/exceptions.rb b/activeresource/lib/active_resource/exceptions.rb
index 56f8a71702..0f4549fd73 100644
--- a/activeresource/lib/active_resource/exceptions.rb
+++ b/activeresource/lib/active_resource/exceptions.rb
@@ -1,5 +1,3 @@
-require 'action_controller/metal/exceptions'
-
module ActiveResource
class ConnectionError < StandardError # :nodoc:
attr_reader :response