From c2193c11ad215d3a2d7d35960630b3e1902a5082 Mon Sep 17 00:00:00 2001
From: Yury Velikanau <yury.velikanau@gmail.com>
Date: Wed, 9 May 2012 10:54:20 -0700
Subject: Make sure TimeoutError is loaded.

---
 activeresource/lib/active_resource.rb      | 1 +
 activeresource/lib/active_resource/base.rb | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

(limited to 'activeresource')

diff --git a/activeresource/lib/active_resource.rb b/activeresource/lib/active_resource.rb
index 0794a1a800..5730d7e52a 100644
--- a/activeresource/lib/active_resource.rb
+++ b/activeresource/lib/active_resource.rb
@@ -29,6 +29,7 @@ $:.unshift(activemodel_path) if File.directory?(activemodel_path) && !$:.include
 
 require 'active_support'
 require 'active_model'
+require 'active_resource/exceptions'
 require 'active_resource/version'
 
 module ActiveResource
diff --git a/activeresource/lib/active_resource/base.rb b/activeresource/lib/active_resource/base.rb
index 10cc727bd9..032a245c3c 100644
--- a/activeresource/lib/active_resource/base.rb
+++ b/activeresource/lib/active_resource/base.rb
@@ -12,7 +12,6 @@ require 'set'
 require 'uri'
 
 require 'active_support/core_ext/uri'
-require 'active_resource/exceptions'
 require 'active_resource/connection'
 require 'active_resource/formats'
 require 'active_resource/schema'
-- 
cgit v1.2.3