diff options
| author | Mehmet Emin İNAÇ <mehmetemininac@gmail.com> | 2016-02-13 17:05:41 +0200 |
|---|---|---|
| committer | Mehmet Emin İNAÇ <mehmetemininac@gmail.com> | 2016-02-13 17:11:05 +0200 |
| commit | 2b63f2ee75467f020ebdcd379bcfac38dc7a8ee2 (patch) | |
| tree | 70dac70a231ce88bb5d1376a01ed7e025c518dae /actionmailer | |
| parent | 3974edb9ceff244e813358483a036d12578f7cca (diff) | |
| download | rails-2b63f2ee75467f020ebdcd379bcfac38dc7a8ee2.tar.gz rails-2b63f2ee75467f020ebdcd379bcfac38dc7a8ee2.tar.bz2 rails-2b63f2ee75467f020ebdcd379bcfac38dc7a8ee2.zip | |
Change x-gzip to gzip in docs [ci skip]
For more information about GNU zip mime type please check IETF's web site [RFC6713](http://tools.ietf.org/html/rfc6713) or [IANA](http://www.iana.org/assignments/media-types/media-types.xhtml#application)
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 } # |