aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support
diff options
context:
space:
mode:
authorJon Moss <maclover7@users.noreply.github.com>2016-01-25 12:41:45 -0500
committerJon Moss <maclover7@users.noreply.github.com>2016-01-25 12:41:45 -0500
commit14e92bac1a4c199e5e8936c6bdc64420293ea6d1 (patch)
treecf3c72f83aec1044f23106060cddbbdeb96642f3 /activesupport/lib/active_support
parent4962b44755722eec4a18e52b96ee8fb557ca351d (diff)
parentc7281b37ac35dd5522b1333a5c89bb399e566b93 (diff)
downloadrails-14e92bac1a4c199e5e8936c6bdc64420293ea6d1.tar.gz
rails-14e92bac1a4c199e5e8936c6bdc64420293ea6d1.tar.bz2
rails-14e92bac1a4c199e5e8936c6bdc64420293ea6d1.zip
Merge pull request #23226 from vipulnsward/20808-fix
Fix nodoc to internal class error document some of them
Diffstat (limited to 'activesupport/lib/active_support')
-rw-r--r--activesupport/lib/active_support/core_ext/hash/conversions.rb2
-rw-r--r--activesupport/lib/active_support/core_ext/string/output_safety.rb1
-rw-r--r--activesupport/lib/active_support/deprecation/behaviors.rb2
3 files changed, 5 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/core_ext/hash/conversions.rb b/activesupport/lib/active_support/core_ext/hash/conversions.rb
index 8594d9bf2e..6741e732f0 100644
--- a/activesupport/lib/active_support/core_ext/hash/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/hash/conversions.rb
@@ -138,6 +138,8 @@ end
module ActiveSupport
class XMLConverter # :nodoc:
+ # Raised if the XML contains attributes with type="yaml" or
+ # type="symbol". Read Hash#from_xml for more details.
class DisallowedType < StandardError
def initialize(type)
super "Disallowed type attribute: #{type.inspect}"
diff --git a/activesupport/lib/active_support/core_ext/string/output_safety.rb b/activesupport/lib/active_support/core_ext/string/output_safety.rb
index 04ed8e7cd8..6251f34daf 100644
--- a/activesupport/lib/active_support/core_ext/string/output_safety.rb
+++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb
@@ -141,6 +141,7 @@ module ActiveSupport #:nodoc:
alias_method :original_concat, :concat
private :original_concat
+ # Raised when <tt>ActiveSupport::SafeBuffer#safe_concat</tt> is called on unsafe buffers.
class SafeConcatError < StandardError
def initialize
super 'Could not concatenate to the buffer because it is not html safe.'
diff --git a/activesupport/lib/active_support/deprecation/behaviors.rb b/activesupport/lib/active_support/deprecation/behaviors.rb
index 28d2d78643..0de891f1a2 100644
--- a/activesupport/lib/active_support/deprecation/behaviors.rb
+++ b/activesupport/lib/active_support/deprecation/behaviors.rb
@@ -1,6 +1,8 @@
require "active_support/notifications"
module ActiveSupport
+ # Raised when <tt>ActiveSupport::Deprecation::Behavior#behavior</tt> is set with <tt>:raise</tt>.
+ # You would set <tt>:raise</tt>, as a behaviour to raise errors and proactively report exceptions from deprecations.
class DeprecationException < StandardError
end