diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-03-19 23:45:08 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-03-19 23:45:08 +0000 |
| commit | 77acfefedf80a2c30f8a0f71b5b6d33d1b9fd144 (patch) | |
| tree | 8ee169fa9dc6cd1dcc9e221e196dd0665234d78f /activerecord/lib | |
| parent | 638333b7a17234ed65b2e8b0bee3d9b533446803 (diff) | |
| download | rails-77acfefedf80a2c30f8a0f71b5b6d33d1b9fd144.tar.gz rails-77acfefedf80a2c30f8a0f71b5b6d33d1b9fd144.tar.bz2 rails-77acfefedf80a2c30f8a0f71b5b6d33d1b9fd144.zip | |
Make Active Resource use ActiveModel::Errors
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record.rb | 4 |
1 files changed, 1 insertions, 3 deletions
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 |