Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Fixes warnings when executing rake test in ActionMailer. #7469

Merged
merged 1 commit into from

2 participants

Toshinori Kajihara José Valim
Toshinori Kajihara
Collaborator

I saw many deprecation warnings in http://travis-ci.org/#!/rails/rails/jobs/2262213 and in my box.
I think it's related to 582a7f4 .

José Valim josevalim merged commit 1ef9b7e into from
Toshinori Kajihara
Collaborator

sorry, I notice that the above code is test breaker in AM isolated test only. I'm investigating.

Toshinori Kajihara
Collaborator

I guess the problem mentioned above comment is fixed by #7477.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
Showing with 1 addition and 1 deletion.
  1. +1 −1  actionmailer/lib/action_mailer/base.rb
2  actionmailer/lib/action_mailer/base.rb
View
@@ -756,7 +756,7 @@ def collect_responses_and_parts_order(headers) #:nodoc:
responses << {
:body => render(:template => template),
- :content_type => template.mime_type.to_s
+ :content_type => template.type.to_s
}
end
end
Something went wrong with that request. Please try again.