Permalink
Browse files

Merge pull request #6230 from spectator/active_resource_exceptions

ActiveResource::TimeoutError is not loaded
  • Loading branch information...
2 parents 22a6072 + c2193c1 commit a9fc8a986d32e6178923f163b65d38a1bd88f563 @jeremy jeremy committed May 10, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −0 activeresource/lib/active_resource.rb
  2. +0 −1 activeresource/lib/active_resource/base.rb
@@ -29,6 +29,7 @@
require 'active_support'
require 'active_model'
+require 'active_resource/exceptions'
require 'active_resource/version'
module ActiveResource
@@ -12,7 +12,6 @@
require 'uri'
require 'active_support/core_ext/uri'
-require 'active_resource/exceptions'
require 'active_resource/connection'
require 'active_resource/formats'
require 'active_resource/schema'

0 comments on commit a9fc8a9

Please sign in to comment.