aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib/action_mailer/parameterized.rb
diff options
context:
space:
mode:
authorGannon McGibbon <gannon.mcgibbon@gmail.com>2018-11-01 16:32:01 -0400
committerGannon McGibbon <gannon.mcgibbon@gmail.com>2018-11-22 18:37:53 -0500
commit60339da5bcb76489576321fa12e665f176d8d692 (patch)
tree882f3a076f9211924a9f4020e7d1729e1ab66543 /actionmailer/lib/action_mailer/parameterized.rb
parent548bd509857ca5bba300915aa5ad9bff6e8c0238 (diff)
downloadrails-60339da5bcb76489576321fa12e665f176d8d692.tar.gz
rails-60339da5bcb76489576321fa12e665f176d8d692.tar.bz2
rails-60339da5bcb76489576321fa12e665f176d8d692.zip
Deliver parameterized mail with DeliveryJob
Deliver parameterized mail with `ActionMailer::DeliveryJob` and remove `ActionMailer::Parameterized::DeliveryJob`.
Diffstat (limited to 'actionmailer/lib/action_mailer/parameterized.rb')
-rw-r--r--actionmailer/lib/action_mailer/parameterized.rb8
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