diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-06-30 23:15:22 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-06-30 23:15:22 +0530 |
| commit | 6b9d1a0db2f7829509689d244d6a5eda5210401d (patch) | |
| tree | 2d4920fa5e2f3d8571573d5aee717cac261c53ac /activesupport/lib | |
| parent | 4662c5f4effd829099d647a7a76c7044fcc68121 (diff) | |
| parent | 32c28e8214940fe6b06043b280e8d342e16eb3c6 (diff) | |
| download | rails-6b9d1a0db2f7829509689d244d6a5eda5210401d.tar.gz rails-6b9d1a0db2f7829509689d244d6a5eda5210401d.tar.bz2 rails-6b9d1a0db2f7829509689d244d6a5eda5210401d.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
activemodel/lib/active_model/errors.rb
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/hash/except.rb | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/activesupport/lib/active_support/core_ext/hash/except.rb b/activesupport/lib/active_support/core_ext/hash/except.rb index 5a61906222..c82da3c6c2 100644 --- a/activesupport/lib/active_support/core_ext/hash/except.rb +++ b/activesupport/lib/active_support/core_ext/hash/except.rb @@ -4,13 +4,6 @@ class Hash # # @person.update_attributes(params[:person].except(:admin)) # - # If the receiver responds to +convert_key+, the method is called on each of the - # arguments. This allows +except+ to play nice with hashes with indifferent access - # for instance: - # - # {:a => 1}.with_indifferent_access.except(:a) # => {} - # {:a => 1}.with_indifferent_access.except('a') # => {} - # def except(*keys) dup.except!(*keys) end |