Skip to content

Commit

Permalink
Deprecated delay extension for ActionMailer 4.2+
Browse files Browse the repository at this point in the history
  • Loading branch information
seuros committed Oct 2, 2014
1 parent fb351d8 commit 9a3e9a1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Changes.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
HEAD
-----------

- Use Rails 4.2's new `deliver_now` method if possible. [#1933]
- Deprecate delay extension for ActionMailer 4.2+ . [#1933]

3.2.5
-----------
Expand Down
1 change: 1 addition & 0 deletions lib/sidekiq/extensions/action_mailer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ def perform(yml)

def deliver(msg)
if msg.respond_to?(:deliver_now)
ActiveSupport::Deprecation.warn('#delay.deliver has been deprecated. Use ActionMailer #deliver_later method instead')
# Rails 4.2/5.0
msg.deliver_now
else
Expand Down

0 comments on commit 9a3e9a1

Please sign in to comment.