diff options
| author | Yury Velikanau <yury.velikanau@gmail.com> | 2012-05-09 10:54:20 -0700 |
|---|---|---|
| committer | Yury Velikanau <yury.velikanau@gmail.com> | 2012-05-10 09:19:07 -0700 |
| commit | c2193c11ad215d3a2d7d35960630b3e1902a5082 (patch) | |
| tree | 1dfd8b0e0eb13db65c1027e9c7e067b06d613740 /activeresource/lib | |
| parent | 8f5079f190c849b2fb4de24739af742cc5a9e37b (diff) | |
| download | rails-c2193c11ad215d3a2d7d35960630b3e1902a5082.tar.gz rails-c2193c11ad215d3a2d7d35960630b3e1902a5082.tar.bz2 rails-c2193c11ad215d3a2d7d35960630b3e1902a5082.zip | |
Make sure TimeoutError is loaded.
Diffstat (limited to 'activeresource/lib')
| -rw-r--r-- | activeresource/lib/active_resource.rb | 1 | ||||
| -rw-r--r-- | activeresource/lib/active_resource/base.rb | 1 |
2 files changed, 1 insertions, 1 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 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' |