aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorMQuy <sugiacupit@gmail.com>2017-01-06 18:37:33 +0800
committerMQuy <sugiacupit@gmail.com>2017-01-06 18:37:33 +0800
commitf091bd67b3ef5f4cd85dbd70cbd11e9ad2711562 (patch)
treefdd943a0e72e4c3d1448da60bb3f76b41d78ed1b /actionmailer
parent40b1f648b949f4ad944024619e546765e3729776 (diff)
downloadrails-f091bd67b3ef5f4cd85dbd70cbd11e9ad2711562.tar.gz
rails-f091bd67b3ef5f4cd85dbd70cbd11e9ad2711562.tar.bz2
rails-f091bd67b3ef5f4cd85dbd70cbd11e9ad2711562.zip
Remove unnecessary condition in content_type
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/lib/action_mailer/base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index a7015b1e6d..35c793351f 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -922,7 +922,7 @@ module ActionMailer
def collect_responses_from_text(headers)
[{
body: headers.delete(:body),
- content_type: headers[:content_type] || self.class.default[:content_type] || "text/plain"
+ content_type: headers[:content_type] || "text/plain"
}]
end