aboutsummaryrefslogtreecommitdiffstats
path: root/activeresource/lib/active_resource.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2012-05-10 09:39:54 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2012-05-10 09:39:54 -0700
commita9fc8a986d32e6178923f163b65d38a1bd88f563 (patch)
tree109b2e9c26c45816ceda2d53e4f398796ca4671c /activeresource/lib/active_resource.rb
parent22a60728a9495ac75075d1d27a706ae7f2df2529 (diff)
parentc2193c11ad215d3a2d7d35960630b3e1902a5082 (diff)
downloadrails-a9fc8a986d32e6178923f163b65d38a1bd88f563.tar.gz
rails-a9fc8a986d32e6178923f163b65d38a1bd88f563.tar.bz2
rails-a9fc8a986d32e6178923f163b65d38a1bd88f563.zip
Merge pull request #6230 from spectator/active_resource_exceptions
ActiveResource::TimeoutError is not loaded
Diffstat (limited to 'activeresource/lib/active_resource.rb')
-rw-r--r--activeresource/lib/active_resource.rb1
1 files changed, 1 insertions, 0 deletions
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