diff options
| author | arktisklada <mail@enorganik.com> | 2016-04-05 10:40:45 -0500 |
|---|---|---|
| committer | arktisklada <mail@enorganik.com> | 2016-04-05 14:11:37 -0500 |
| commit | 23e4c968d220e0e3228bdac56616dc046424f245 (patch) | |
| tree | 24f7671c8ebd5c7e23ec7351d31848195953ed3c | |
| parent | 106851c445c8a0b9358bfa4312f3459b870e775b (diff) | |
| download | rails-23e4c968d220e0e3228bdac56616dc046424f245.tar.gz rails-23e4c968d220e0e3228bdac56616dc046424f245.tar.bz2 rails-23e4c968d220e0e3228bdac56616dc046424f245.zip | |
Sendmail default arguments match Mail::SendMail
Removes `-t`
| -rw-r--r-- | actionmailer/CHANGELOG.md | 6 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/delivery_methods.rb | 2 | ||||
| -rw-r--r-- | actionmailer/test/delivery_methods_test.rb | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md index 51d85b95f2..1109912b04 100644 --- a/actionmailer/CHANGELOG.md +++ b/actionmailer/CHANGELOG.md @@ -1,3 +1,9 @@ +* Removes `-t` from default Sendmail arguments to match the underlying + `Mail::Sendmail` setting. + + *Clayton Liggitt* + + ## Rails 5.0.0.beta3 (February 24, 2016) ## * Add support for fragment caching in Action Mailer views. diff --git a/actionmailer/lib/action_mailer/delivery_methods.rb b/actionmailer/lib/action_mailer/delivery_methods.rb index 4758b55a2a..571c8e7d2a 100644 --- a/actionmailer/lib/action_mailer/delivery_methods.rb +++ b/actionmailer/lib/action_mailer/delivery_methods.rb @@ -36,7 +36,7 @@ module ActionMailer add_delivery_method :sendmail, Mail::Sendmail, location: '/usr/sbin/sendmail', - arguments: '-i -t' + arguments: '-i' add_delivery_method :test, Mail::TestMailer end diff --git a/actionmailer/test/delivery_methods_test.rb b/actionmailer/test/delivery_methods_test.rb index 2786fe0d07..bcbd036f26 100644 --- a/actionmailer/test/delivery_methods_test.rb +++ b/actionmailer/test/delivery_methods_test.rb @@ -39,7 +39,7 @@ class DefaultsDeliveryMethodsTest < ActiveSupport::TestCase test "default sendmail settings" do settings = { location: '/usr/sbin/sendmail', - arguments: '-i -t' + arguments: '-i' } assert_equal settings, ActionMailer::Base.sendmail_settings end |