mirror of
https://github.com/mperham/sidekiq.git
synced 2022-11-09 13:52:34 -05:00
Undeprecate actionmailer delay, fixes #2186
This commit is contained in:
parent
daaba11d85
commit
545c67f30e
2 changed files with 5 additions and 1 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
HEAD
|
||||||
|
-----------
|
||||||
|
|
||||||
|
- Undeprecate delay extension for ActionMailer 4.2+ . [#2186]
|
||||||
|
|
||||||
3.3.2
|
3.3.2
|
||||||
-----------
|
-----------
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,6 @@ module Sidekiq
|
||||||
|
|
||||||
def deliver(msg)
|
def deliver(msg)
|
||||||
if msg.respond_to?(:deliver_now)
|
if msg.respond_to?(:deliver_now)
|
||||||
ActiveSupport::Deprecation.warn('`ActionMailer.delay.method` is deprecated. Use `ActionMailer.method.deliver_later` instead and configure ActiveJob to use Sidekiq.')
|
|
||||||
# Rails 4.2/5.0
|
# Rails 4.2/5.0
|
||||||
msg.deliver_now
|
msg.deliver_now
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in a new issue