aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/core_ext/hash/conversions.rb
diff options
context:
space:
mode:
authorZoltan Kiss <kissx012@umn.edu>2014-03-14 18:08:18 -0500
committerArthur Neves <arthurnn@gmail.com>2014-03-15 12:11:41 -0400
commit2156df13e08ff716463603730657bd321c03f8b4 (patch)
treea0ea0d888eae5a12d55cc8d8e2565216f91e98b4 /activesupport/lib/active_support/core_ext/hash/conversions.rb
parent0da775846aa186238ad1813ed414ae508ae0f706 (diff)
downloadrails-2156df13e08ff716463603730657bd321c03f8b4.tar.gz
rails-2156df13e08ff716463603730657bd321c03f8b4.tar.bz2
rails-2156df13e08ff716463603730657bd321c03f8b4.zip
Minor grammer, code conventions fix [ci skip]
Conflicts: activesupport/lib/active_support/core_ext/hash/conversions.rb
Diffstat (limited to 'activesupport/lib/active_support/core_ext/hash/conversions.rb')
-rw-r--r--activesupport/lib/active_support/core_ext/hash/conversions.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/hash/conversions.rb b/activesupport/lib/active_support/core_ext/hash/conversions.rb
index 7bea461c77..6c3e48a3ca 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 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 @@ module ActiveSupport
end
end
-