aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/CHANGELOG.md
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2017-02-24 19:17:01 -0500
committerRafael Mendonça França <rafaelmfranca@gmail.com>2017-02-24 19:17:01 -0500
commitfeea081199f1398e7fa97bf22eb6081ecd2d6174 (patch)
tree728cc947ca4f84262bb6850d7c082355851e589b /activesupport/CHANGELOG.md
parentccb009511685adac1d14d3c1e07dde640d0d7042 (diff)
parenta72498f776b2e67b7e3a074423181defcd06fc56 (diff)
downloadrails-feea081199f1398e7fa97bf22eb6081ecd2d6174.tar.gz
rails-feea081199f1398e7fa97bf22eb6081ecd2d6174.tar.bz2
rails-feea081199f1398e7fa97bf22eb6081ecd2d6174.zip
Merge pull request #28006 from fareastside/master
Allow ActiveSupport::MarshalWithAutoloading#load to take a Proc
Diffstat (limited to 'activesupport/CHANGELOG.md')
-rw-r--r--activesupport/CHANGELOG.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 428e3fa5e7..cdea917380 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,3 +1,9 @@
+* In Core Extensions, make `MarshalWithAutoloading#load` pass through the second, optional
+ argument for `Marshal#load( source [, proc] )`. This way we don't have to do
+ `Marshal.method(:load).super_method.call(sourse, proc)` just to be able to pass a proc.
+
+ *Jeff Latz*
+
* `ActiveSupport::Gzip.decompress` now checks checksum and length in footer.
*Dylan Thacker-Smith*