diff options
| author | Jon Moss <maclover7@users.noreply.github.com> | 2016-02-13 10:28:21 -0500 |
|---|---|---|
| committer | Jon Moss <maclover7@users.noreply.github.com> | 2016-02-13 10:28:21 -0500 |
| commit | f800e00f9a7150f81dc2d27c26e6d1164df776f3 (patch) | |
| tree | a015199e513c48830b01ffbd9022e1b5bf2e9fae /actionmailer | |
| parent | 7ee2002008eb7bd4546f556670f5332f06901a0d (diff) | |
| parent | 2b63f2ee75467f020ebdcd379bcfac38dc7a8ee2 (diff) | |
| download | rails-f800e00f9a7150f81dc2d27c26e6d1164df776f3.tar.gz rails-f800e00f9a7150f81dc2d27c26e6d1164df776f3.tar.bz2 rails-f800e00f9a7150f81dc2d27c26e6d1164df776f3.zip | |
Merge pull request #23660 from meinac/change_x_gzip_to_gzip
Change x-gzip to gzip in docs [ci skip]
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index bb3cb1be45..4259eb0bee 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -664,7 +664,7 @@ module ActionMailer # # You can also specify overrides if you want by passing a hash instead of a string: # - # mail.attachments['filename.jpg'] = {mime_type: 'application/x-gzip', + # mail.attachments['filename.jpg'] = {mime_type: 'application/gzip', # content: File.read('/path/to/filename.jpg')} # # If you want to use encoding other than Base64 then you will need to pass encoding @@ -672,7 +672,7 @@ module ActionMailer # data: # # file_content = SpecialEncode(File.read('/path/to/filename.jpg')) - # mail.attachments['filename.jpg'] = {mime_type: 'application/x-gzip', + # mail.attachments['filename.jpg'] = {mime_type: 'application/gzip', # encoding: 'SpecialEncoding', # content: file_content } # |