From 8828b2ca674acfa028a3c1e086a1795d3bb893e1 Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Thu, 19 Mar 2009 23:28:59 +0000
Subject: Move all the Active Record validations to Active Model

---
 activerecord/lib/active_record/base.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activerecord/lib/active_record/base.rb')

diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 2a5385119d..bf7fd904b1 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -3136,7 +3136,7 @@ module ActiveRecord #:nodoc:
 
   Base.class_eval do
     extend QueryCache::ClassMethods
-    include Validations
+    include ::ActiveModel::Validations, Validations
     include Locking::Optimistic, Locking::Pessimistic
     include AttributeMethods
     include Dirty
-- 
cgit v1.2.3