diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2010-01-22 21:10:52 +1100 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2010-01-22 21:10:52 +1100 |
| commit | 1170e70797e06b3f062e222d912b0cc1dd6072e5 (patch) | |
| tree | 5b46b0cc33e00137f3ac505f7d854895093b7b5c /actionmailer/lib/action_mailer/tmail_compat.rb | |
| parent | 6fd7d1fc128f1d6d7bddaa6770739d7e936dd049 (diff) | |
| parent | bb9d71ff9e537597ff4d5962e7870ad99001f605 (diff) | |
| download | rails-1170e70797e06b3f062e222d912b0cc1dd6072e5.tar.gz rails-1170e70797e06b3f062e222d912b0cc1dd6072e5.tar.bz2 rails-1170e70797e06b3f062e222d912b0cc1dd6072e5.zip | |
Merge branch 'master' of github.com:mikel/rails
Diffstat (limited to 'actionmailer/lib/action_mailer/tmail_compat.rb')
| -rw-r--r-- | actionmailer/lib/action_mailer/tmail_compat.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionmailer/lib/action_mailer/tmail_compat.rb b/actionmailer/lib/action_mailer/tmail_compat.rb index da13aac677..d78332c135 100644 --- a/actionmailer/lib/action_mailer/tmail_compat.rb +++ b/actionmailer/lib/action_mailer/tmail_compat.rb @@ -3,7 +3,7 @@ module Mail def set_content_type(*args) ActiveSupport::Deprecation.warn('Message#set_content_type is deprecated, please just call ' << - 'Message#content_type with the same arguments.', caller[0,10]) + 'Message#content_type with the same arguments', caller[0,10]) content_type(*args) end @@ -11,7 +11,7 @@ module Mail def transfer_encoding(value = nil) if value ActiveSupport::Deprecation.warn('Message#transfer_encoding is deprecated, please call ' << - 'Message#content_transfer_encoding with the same arguments.', caller[0,10]) + 'Message#content_transfer_encoding with the same arguments', caller[0,10]) content_transfer_encoding(value) else old_transfer_encoding @@ -20,7 +20,7 @@ module Mail def original_filename ActiveSupport::Deprecation.warn('Message#original_filename is deprecated, ' << - 'please call Message#filename.', caller[0,10]) + 'please call Message#filename', caller[0,10]) filename end |