From 07563036b0b5c5ddf5b1a31473aa2a2b32b608f5 Mon Sep 17 00:00:00 2001 From: Prathamesh Sonpatki Date: Thu, 4 Jan 2018 21:51:30 +0530 Subject: Move the options for deliver_later up near to the example [ci skip] - And move the Active Job related section down. Otherwise it was appearing as if the options are available for the `delivery_job` setting. --- actionmailer/lib/action_mailer/message_delivery.rb | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'actionmailer') diff --git a/actionmailer/lib/action_mailer/message_delivery.rb b/actionmailer/lib/action_mailer/message_delivery.rb index a2ea45dc7b..2377aeb9a5 100644 --- a/actionmailer/lib/action_mailer/message_delivery.rb +++ b/actionmailer/lib/action_mailer/message_delivery.rb @@ -53,6 +53,12 @@ module ActionMailer # Notifier.welcome(User.first).deliver_later!(wait: 1.hour) # Notifier.welcome(User.first).deliver_later!(wait_until: 10.hours.from_now) # + # Options: + # + # * :wait - Enqueue the email to be delivered with a delay + # * :wait_until - Enqueue the email to be delivered at (after) a specific date / time + # * :queue - Enqueue the email on the specified queue + # # By default, the email will be enqueued using ActionMailer::DeliveryJob. Each # ActionMailer::Base class can specify the job to use by setting the class variable # +delivery_job+. @@ -60,12 +66,6 @@ module ActionMailer # class AccountRegistrationMailer < ApplicationMailer # self.delivery_job = RegistrationDeliveryJob # end - # - # Options: - # - # * :wait - Enqueue the email to be delivered with a delay - # * :wait_until - Enqueue the email to be delivered at (after) a specific date / time - # * :queue - Enqueue the email on the specified queue def deliver_later!(options = {}) enqueue_delivery :deliver_now!, options end @@ -77,6 +77,12 @@ module ActionMailer # Notifier.welcome(User.first).deliver_later(wait: 1.hour) # Notifier.welcome(User.first).deliver_later(wait_until: 10.hours.from_now) # + # Options: + # + # * :wait - Enqueue the email to be delivered with a delay. + # * :wait_until - Enqueue the email to be delivered at (after) a specific date / time. + # * :queue - Enqueue the email on the specified queue. + # # By default, the email will be enqueued using ActionMailer::DeliveryJob. Each # ActionMailer::Base class can specify the job to use by setting the class variable # +delivery_job+. @@ -84,12 +90,6 @@ module ActionMailer # class AccountRegistrationMailer < ApplicationMailer # self.delivery_job = RegistrationDeliveryJob # end - # - # Options: - # - # * :wait - Enqueue the email to be delivered with a delay. - # * :wait_until - Enqueue the email to be delivered at (after) a specific date / time. - # * :queue - Enqueue the email on the specified queue. def deliver_later(options = {}) enqueue_delivery :deliver_now, options end -- cgit v1.2.3