From 77acfefedf80a2c30f8a0f71b5b6d33d1b9fd144 Mon Sep 17 00:00:00 2001 From: Pratik Naik Date: Thu, 19 Mar 2009 23:45:08 +0000 Subject: Make Active Resource use ActiveModel::Errors --- activerecord/lib/active_record.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'activerecord') diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index 104d3b2917..07a10fb023 100644 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -35,9 +35,7 @@ begin require 'active_model' rescue LoadError $:.unshift "#{File.dirname(__FILE__)}/../../activemodel/lib" - require 'active_model' -else - + require 'active_model' end module ActiveRecord -- cgit v1.2.3