aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPrathamesh Sonpatki <csonpatki@gmail.com>2018-01-04 21:51:30 +0530
committerPrathamesh Sonpatki <csonpatki@gmail.com>2018-01-04 21:51:30 +0530
commit07563036b0b5c5ddf5b1a31473aa2a2b32b608f5 (patch)
tree54bbf72baf8b5dc7acc99a6adbb6ac16d4955276
parent7eaae937e661ad3026cf25f407e202779c9ea27b (diff)
downloadrails-07563036b0b5c5ddf5b1a31473aa2a2b32b608f5.tar.gz
rails-07563036b0b5c5ddf5b1a31473aa2a2b32b608f5.tar.bz2
rails-07563036b0b5c5ddf5b1a31473aa2a2b32b608f5.zip
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.
-rw-r--r--actionmailer/lib/action_mailer/message_delivery.rb24
1 files changed, 12 insertions, 12 deletions
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:
+ #
+ # * <tt>:wait</tt> - Enqueue the email to be delivered with a delay
+ # * <tt>:wait_until</tt> - Enqueue the email to be delivered at (after) a specific date / time
+ # * <tt>:queue</tt> - Enqueue the email on the specified queue
+ #
# By default, the email will be enqueued using <tt>ActionMailer::DeliveryJob</tt>. Each
# <tt>ActionMailer::Base</tt> 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:
- #
- # * <tt>:wait</tt> - Enqueue the email to be delivered with a delay
- # * <tt>:wait_until</tt> - Enqueue the email to be delivered at (after) a specific date / time
- # * <tt>:queue</tt> - 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:
+ #
+ # * <tt>:wait</tt> - Enqueue the email to be delivered with a delay.
+ # * <tt>:wait_until</tt> - Enqueue the email to be delivered at (after) a specific date / time.
+ # * <tt>:queue</tt> - Enqueue the email on the specified queue.
+ #
# By default, the email will be enqueued using <tt>ActionMailer::DeliveryJob</tt>. Each
# <tt>ActionMailer::Base</tt> 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:
- #
- # * <tt>:wait</tt> - Enqueue the email to be delivered with a delay.
- # * <tt>:wait_until</tt> - Enqueue the email to be delivered at (after) a specific date / time.
- # * <tt>:queue</tt> - Enqueue the email on the specified queue.
def deliver_later(options = {})
enqueue_delivery :deliver_now, options
end