From 59e4c996b3e9af4004eca6486ffd178b42fe2bc9 Mon Sep 17 00:00:00 2001
From: Ryuta Kamizono <kamipo@gmail.com>
Date: Fri, 20 Dec 2019 22:29:40 +0900
Subject: [PATCH] Merge pull request #38053 from
 Shopify/actionmailer-6-0-stable-ruby-2.7-warnings

Fix Ruby 2.7 warnings in Action Mailer 6.0
---
 activejob/lib/active_job/execution.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/activejob/lib/active_job/execution.rb b/activejob/lib/active_job/execution.rb
index 545a54efb4..faba8589ef 100644
--- a/activejob/lib/active_job/execution.rb
+++ b/activejob/lib/active_job/execution.rb
@@ -38,7 +38,13 @@ def perform_now
       successfully_performed = false
 
       run_callbacks :perform do
-        perform(*arguments)
+        args = arguments
+        options = args.extract_options!
+        if options.empty?
+          perform(*args)
+        else
+          perform(*args, **options)
+        end
         successfully_performed = true
       end
 
-- 
GitLab