Permalink
Browse files

Prefer sibling Active Support

  • Loading branch information...
1 parent 2f42433 commit a05cfb6df5336aa0369e6b27294dae3c418a75c6 @jeremy jeremy committed May 6, 2009
Showing with 3 additions and 9 deletions.
  1. +3 −9 activeresource/lib/active_resource.rb
@@ -21,15 +21,9 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#++
-begin
- require 'active_support'
-rescue LoadError
- activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib"
- if File.directory?(activesupport_path)
- $:.unshift activesupport_path
- require 'active_support'
- end
-end
+activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib"
+$:.unshift(activesupport_path) if File.directory?(activesupport_path)
+require 'active_support'
require 'active_support/core/all'
require 'active_resource/formats'

0 comments on commit a05cfb6

Please sign in to comment.