From 755dcd0691f74079c24196135f89b917062b0715 Mon Sep 17 00:00:00 2001 From: claudiob Date: Fri, 2 Jan 2015 18:01:01 -0800 Subject: Remove deprecated ActionMailer deliver & deliver! These methods were deprecated in Rails 4.2 (see f4ee1147) so they can be safely removed in Rails 5.0. --- actionmailer/lib/action_mailer/message_delivery.rb | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'actionmailer/lib') diff --git a/actionmailer/lib/action_mailer/message_delivery.rb b/actionmailer/lib/action_mailer/message_delivery.rb index b5dc2d7497..2cb195d9d1 100644 --- a/actionmailer/lib/action_mailer/message_delivery.rb +++ b/actionmailer/lib/action_mailer/message_delivery.rb @@ -85,26 +85,6 @@ module ActionMailer message.deliver end - def deliver! #:nodoc: - ActiveSupport::Deprecation.warn(<<-MSG.squish) - `#deliver!` is deprecated and will be removed in Rails 5. Use - `#deliver_now!` to deliver immediately or `#deliver_later!` to - deliver through Active Job. - MSG - - deliver_now! - end - - def deliver #:nodoc: - ActiveSupport::Deprecation.warn(<<-MSG.squish) - `#deliver` is deprecated and will be removed in Rails 5. Use - `#deliver_now` to deliver immediately or `#deliver_later` to - deliver through Active Job. - MSG - - deliver_now - end - private def enqueue_delivery(delivery_method, options={}) -- cgit v1.2.3