diff options
author | Rafael França <rafaelmfranca@gmail.com> | 2018-11-23 17:00:45 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-23 17:00:45 -0500 |
commit | 34726ad8959079fea17a2f6ea7fc2bd4864255a6 (patch) | |
tree | 59438a03e8096c5232ff1d43a55c08cc4a307f84 /actionmailer/lib/action_mailer/parameterized.rb | |
parent | 437d20916f80eb905a1c028db4bd53304c293e61 (diff) | |
parent | 60339da5bcb76489576321fa12e665f176d8d692 (diff) | |
download | rails-34726ad8959079fea17a2f6ea7fc2bd4864255a6.tar.gz rails-34726ad8959079fea17a2f6ea7fc2bd4864255a6.tar.bz2 rails-34726ad8959079fea17a2f6ea7fc2bd4864255a6.zip |
Merge pull request #34367 from gmcgibbon/rm_parameterized_delivery_job
Deliver parameterized mail with DeliveryJob
Diffstat (limited to 'actionmailer/lib/action_mailer/parameterized.rb')
-rw-r--r-- | actionmailer/lib/action_mailer/parameterized.rb | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/actionmailer/lib/action_mailer/parameterized.rb b/actionmailer/lib/action_mailer/parameterized.rb index 0fe417affe..0b0afd6ad4 100644 --- a/actionmailer/lib/action_mailer/parameterized.rb +++ b/actionmailer/lib/action_mailer/parameterized.rb @@ -140,16 +140,10 @@ module ActionMailer super else args = @mailer_class.name, @action.to_s, delivery_method.to_s, @params, *@args - job = @mailer_class.parameterized_delivery_job + job = @mailer_class.delivery_job job.set(options).perform_later(*args) end end end - - class DeliveryJob < ActionMailer::DeliveryJob # :nodoc: - def perform(mailer, mail_method, delivery_method, params, *args) - mailer.constantize.with(params).public_send(mail_method, *args).send(delivery_method) - end - end end end |