diff options
| author | Greg Campbell <gtcampbell@gmail.com> | 2010-08-05 12:09:57 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-08-12 13:11:48 -0300 |
| commit | 90a7915ab2cf29bebf2e7c4f67eb39e23278efd5 (patch) | |
| tree | 4a533aca5dab5cdb3af0242fe2849e5801506ccb /activemodel | |
| parent | 6ed1ba472e0f649726d9a0d04056934d1afe4573 (diff) | |
| download | rails-90a7915ab2cf29bebf2e7c4f67eb39e23278efd5.tar.gz rails-90a7915ab2cf29bebf2e7c4f67eb39e23278efd5.tar.bz2 rails-90a7915ab2cf29bebf2e7c4f67eb39e23278efd5.zip | |
Add missing ActiveModel::Validations require
[#5311 state: resolved]
ActiveModel::Validations uses Hash#except, but does not require it from
ActiveSupport. (This wasn't showing up in the tests, because it was
required in the helper, and was also required in
ActiveModel::Serialization).
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'activemodel')
| -rw-r--r-- | activemodel/lib/active_model/validations.rb | 1 | ||||
| -rw-r--r-- | activemodel/test/cases/helper.rb | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/validations.rb b/activemodel/lib/active_model/validations.rb index 3407c59e7a..37429f2bb8 100644 --- a/activemodel/lib/active_model/validations.rb +++ b/activemodel/lib/active_model/validations.rb @@ -2,6 +2,7 @@ require 'active_support/core_ext/array/extract_options' require 'active_support/core_ext/array/wrap' require 'active_support/core_ext/class/attribute' require 'active_support/core_ext/hash/keys' +require 'active_support/core_ext/hash/except' require 'active_model/errors' require 'active_model/validations/callbacks' diff --git a/activemodel/test/cases/helper.rb b/activemodel/test/cases/helper.rb index a32f11484a..a81584bbad 100644 --- a/activemodel/test/cases/helper.rb +++ b/activemodel/test/cases/helper.rb @@ -6,7 +6,6 @@ $:.unshift(lib) unless $:.include?('lib') || $:.include?(lib) require 'config' require 'active_model' require 'active_support/core_ext/string/access' -require 'active_support/core_ext/hash/except' # Show backtraces for deprecated behavior for quicker cleanup. ActiveSupport::Deprecation.debug = true |