Undeprecate actionmailer delay, fixes sidekiq#2186

philosophie · Mar 2, 2015 · 545c67f · 545c67f
1 parent daaba11
commit 545c67f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Changes.md b/Changes.md
@@ -1,3 +1,8 @@
+HEAD
+-----------
+
+- Undeprecate delay extension for ActionMailer 4.2+ . [#2186]
+
 3.3.2
 -----------
 

diff --git a/lib/sidekiq/extensions/action_mailer.rb b/lib/sidekiq/extensions/action_mailer.rb
@@ -28,7 +28,6 @@ def perform(yml)
 
       def deliver(msg)
         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
           msg.deliver_now
         else