Merge pull request #38053 from Shopify/actionmailer-6-0-stable-ruby-2.7-warnings

Fix Ruby 2.7 warnings in Action Mailer 6.0
2019-12-20 22:29:40 +09:00 · 2019-12-20 22:29:40 +09:00 · 59e4c996b3
parent 008c4669cc
commit 59e4c996b3
1 changed files with 7 additions and 1 deletions
--- a/activejob/lib/active_job/execution.rb
+++ b/activejob/lib/active_job/execution.rb
@ -38,7 +38,13 @@ module ActiveJob
      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