diff options
| author | José Valim <jose.valim@plataformatec.com.br> | 2012-08-28 10:05:55 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@plataformatec.com.br> | 2012-08-28 10:05:55 -0700 |
| commit | 1ef9b7ec7834ef3d01df72230b1e1768bfbf46f2 (patch) | |
| tree | cd230621565105f83721a330f90b77234f7af930 | |
| parent | 52c0bf9843819b3a75d2bac2b8181966508913bc (diff) | |
| parent | 167f250d98a9a7e5895176b134d337c0a34560f1 (diff) | |
| download | rails-1ef9b7ec7834ef3d01df72230b1e1768bfbf46f2.tar.gz rails-1ef9b7ec7834ef3d01df72230b1e1768bfbf46f2.tar.bz2 rails-1ef9b7ec7834ef3d01df72230b1e1768bfbf46f2.zip | |
Merge pull request #7469 from kennyj/fix_many_warnings_in_am
Fixes warnings when executing rake test in ActionMailer.
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 900da9697e..f5c325179f 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -756,7 +756,7 @@ module ActionMailer #:nodoc: responses << { :body => render(:template => template), - :content_type => template.mime_type.to_s + :content_type => template.type.to_s } end end |