diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2010-07-03 12:46:38 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-07-03 12:46:38 -0700 |
commit | 070c24232f74c75b60757ff2bd3cc00ea662d5a6 (patch) | |
tree | 7d5c5c3635571fcfd06144f2dff7057e470105b3 /activemodel/lib/active_model/errors.rb | |
parent | 54250a5bfe6992afaaca6357d3b414e6c49651ba (diff) | |
parent | 075f8b72418f2d2ce9c2038bd57139955f6e46ec (diff) | |
download | rails-070c24232f74c75b60757ff2bd3cc00ea662d5a6.tar.gz rails-070c24232f74c75b60757ff2bd3cc00ea662d5a6.tar.bz2 rails-070c24232f74c75b60757ff2bd3cc00ea662d5a6.zip |
Merge remote branch 'spastorino/master'
Diffstat (limited to 'activemodel/lib/active_model/errors.rb')
-rw-r--r-- | activemodel/lib/active_model/errors.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activemodel/lib/active_model/errors.rb b/activemodel/lib/active_model/errors.rb index d42fc5291d..482b3dac47 100644 --- a/activemodel/lib/active_model/errors.rb +++ b/activemodel/lib/active_model/errors.rb @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- require 'active_support/core_ext/array/wrap' +require 'active_support/core_ext/array/conversions' require 'active_support/core_ext/string/inflections' require 'active_support/core_ext/object/blank' require 'active_support/core_ext/hash/reverse_merge' |