diff options
| author | Xavier Noria <fxn@hashref.com> | 2014-10-28 16:46:19 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2014-10-28 16:46:19 -0700 |
| commit | cd45306dbdf229ada6783c36cbd9cc18da26954a (patch) | |
| tree | 704402cb6a6ddccc23321d202f0d79fd5a828788 /actionmailer/lib/action_mailer | |
| parent | 21f081c0ca86df65c2598e3a273a4c9a785dd5d6 (diff) | |
| parent | b3bfa361c503e107aff4dee5edf79bd7fd3d3725 (diff) | |
| download | rails-cd45306dbdf229ada6783c36cbd9cc18da26954a.tar.gz rails-cd45306dbdf229ada6783c36cbd9cc18da26954a.tar.bz2 rails-cd45306dbdf229ada6783c36cbd9cc18da26954a.zip | |
Merge pull request #17421 from rails/warn-with-heredoc
let warn with heredocs
Diffstat (limited to 'actionmailer/lib/action_mailer')
| -rw-r--r-- | actionmailer/lib/action_mailer/message_delivery.rb | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/actionmailer/lib/action_mailer/message_delivery.rb b/actionmailer/lib/action_mailer/message_delivery.rb index c18e914f37..e058b3b15d 100644 --- a/actionmailer/lib/action_mailer/message_delivery.rb +++ b/actionmailer/lib/action_mailer/message_delivery.rb @@ -1,4 +1,5 @@ require 'delegate' +require 'active_support/core_ext/string/filters' module ActionMailer @@ -85,14 +86,22 @@ module ActionMailer end def deliver! #:nodoc: - ActiveSupport::Deprecation.warn "#deliver! is deprecated and will be removed in Rails 5. " \ - "Use #deliver_now! to deliver immediately or #deliver_later! to deliver through Active Job." + 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 "#deliver is deprecated and will be removed in Rails 5. " \ - "Use #deliver_now to deliver immediately or #deliver_later to deliver through Active Job." + 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 |