Skip to content
Browse files

Silence known internal AM deprecation calls

  • Loading branch information...
1 parent 97be853 commit 5d9af09563897bd36b4baaf9bb366cf100be90a9 @josh josh committed
Showing with 7 additions and 3 deletions.
  1. +7 −3 actionmailer/lib/action_mailer/base.rb
View
10 actionmailer/lib/action_mailer/base.rb
@@ -515,11 +515,15 @@ def initialize_defaults(method_name)
@headers ||= {}
@sent_on ||= Time.now
- super # Run deprecation hooks
+ ActiveSupport::Deprecation.silence do
+ super # Run deprecation hooks
+ end
end
def create_parts
- super # Run deprecation hooks
+ ActiveSupport::Deprecation.silence do
+ super # Run deprecation hooks
+ end
if String === response_body
@parts.unshift Part.new(
@@ -592,7 +596,7 @@ def create_mail
headers.each { |k, v| m[k] = v }
real_content_type, ctype_attrs = parse_content_type
-
+
if @parts.empty?
m.set_content_type(real_content_type, nil, ctype_attrs)
m.body = normalize_new_lines(body)

0 comments on commit 5d9af09

Please sign in to comment.
Something went wrong with that request. Please try again.