diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2017-02-24 19:17:01 -0500 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2017-02-24 19:17:01 -0500 |
| commit | feea081199f1398e7fa97bf22eb6081ecd2d6174 (patch) | |
| tree | 728cc947ca4f84262bb6850d7c082355851e589b /activesupport/lib/active_support | |
| parent | ccb009511685adac1d14d3c1e07dde640d0d7042 (diff) | |
| parent | a72498f776b2e67b7e3a074423181defcd06fc56 (diff) | |
| download | rails-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/lib/active_support')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/marshal.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/marshal.rb b/activesupport/lib/active_support/core_ext/marshal.rb index edfc8296fe..bba2b3be2e 100644 --- a/activesupport/lib/active_support/core_ext/marshal.rb +++ b/activesupport/lib/active_support/core_ext/marshal.rb @@ -1,7 +1,7 @@ module ActiveSupport module MarshalWithAutoloading # :nodoc: - def load(source) - super(source) + def load(source, proc = nil) + super(source, proc) rescue ArgumentError, NameError => exc if exc.message.match(%r|undefined class/module (.+?)(?:::)?\z|) # try loading the class/module |