Permalink
Browse files

Minor grammer, code conventions fix [ci skip]

Conflicts:
	activesupport/lib/active_support/core_ext/hash/conversions.rb
  • Loading branch information...
1 parent 0da7758 commit 2156df13e08ff716463603730657bd321c03f8b4 @zoltankiss zoltankiss committed with arthurnn Mar 14, 2014
Showing with 1 addition and 2 deletions.
  1. +1 −2 activesupport/lib/active_support/core_ext/hash/conversions.rb
@@ -105,7 +105,7 @@ class << self
# hash = Hash.from_xml(xml)
# # => {"hash"=>{"foo"=>1, "bar"=>2}}
#
- # DisallowedType is raised 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
@@ -241,4 +241,3 @@ def process_array(value)
end
end
-

0 comments on commit 2156df1

Please sign in to comment.