summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--lib/delegate.rb6
2 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5a23fa29fb..102ad42ee2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat May 31 03:50:50 2014 Zachary Scott <e@zzak.io>
+
+ * lib/delegate.rb: [DOC] Document raise in Delegator class
+ Patch by @lucasmazza. [Fixes GH-621]
+ https://github.com/ruby/ruby/pull/621
+
Fri May 30 21:23:26 2014 Tanaka Akira <akr@fsij.org>
* lib/webrick/server.rb: Use a pipe to detect server shutdown.
diff --git a/lib/delegate.rb b/lib/delegate.rb
index cdb525844c..be871090a7 100644
--- a/lib/delegate.rb
+++ b/lib/delegate.rb
@@ -62,6 +62,12 @@ class Delegator < BasicObject
end
# :startdoc:
+ ##
+ # :method: raise
+ # Use __raise__ if your Delegator does not have a object to delegate the
+ # raise method call.
+ #
+
#
# Pass in the _obj_ to delegate method calls to. All methods supported by
# _obj_ will be delegated to.