diff options
| author | Yves Senn <yves.senn@gmail.com> | 2014-01-14 00:29:32 -0800 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2014-01-14 00:29:32 -0800 |
| commit | d901699acac572a7c3b5f3de45d8f59e83d0db2a (patch) | |
| tree | defa9aa5e490a4089a44b4d3ac93bb8f02cd2303 /activesupport/lib/active_support/core_ext/hash | |
| parent | 66f3d5bd5a0b6cda11a8fe8aa2ebcfc25cb8f53d (diff) | |
| parent | a71a8e2a35e159b92d393228b935cee8301fce34 (diff) | |
| download | rails-d901699acac572a7c3b5f3de45d8f59e83d0db2a.tar.gz rails-d901699acac572a7c3b5f3de45d8f59e83d0db2a.tar.bz2 rails-d901699acac572a7c3b5f3de45d8f59e83d0db2a.zip | |
Merge pull request #13709 from akshay-vishnoi/typo
[ci skip] Grammar correction
Diffstat (limited to 'activesupport/lib/active_support/core_ext/hash')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/hash/conversions.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/hash/conversions.rb b/activesupport/lib/active_support/core_ext/hash/conversions.rb index 2684c772ea..7bea461c77 100644 --- a/activesupport/lib/active_support/core_ext/hash/conversions.rb +++ b/activesupport/lib/active_support/core_ext/hash/conversions.rb @@ -105,7 +105,7 @@ class Hash # hash = Hash.from_xml(xml) # # => {"hash"=>{"foo"=>1, "bar"=>2}} # - # DisallowedType is raise if the XML contains attributes with <tt>type="yaml"</tt> or + # DisallowedType is raised if the XML contains attributes with <tt>type="yaml"</tt> or # <tt>type="symbol"</tt>. Use <tt>Hash.from_trusted_xml</tt> to parse this XML. def from_xml(xml, disallowed_types = nil) ActiveSupport::XMLConverter.new(xml, disallowed_types).to_h |