From a72498f776b2e67b7e3a074423181defcd06fc56 Mon Sep 17 00:00:00 2001
From: Jeff Latz <jeff@pumpone.com>
Date: Tue, 14 Feb 2017 14:47:30 -0500
Subject: add optional second argument to ActiveSupport core extension for
 Marshal#load so it can take a proc

---
 activesupport/lib/active_support/core_ext/marshal.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'activesupport/lib')

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
-- 
cgit v1.2.3