diff options
| author | Stefan Penner <stefan.penner@gmail.com> | 2010-01-27 22:44:56 -0600 |
|---|---|---|
| committer | Stefan Penner <stefan.penner@gmail.com> | 2010-01-27 22:44:56 -0600 |
| commit | 3aa1ea1ae4baa4a03d03644e798eeb98a4745785 (patch) | |
| tree | 199dab8c28aa5476373af32000159f38cda04cdc /actionmailer/lib/action_mailer/deprecated_api.rb | |
| parent | 2ec99192d59e3f901b301d5735cee9a0b9ee091a (diff) | |
| parent | 2c12a71378d2146c822acb389b00b866f6420ff5 (diff) | |
| download | rails-3aa1ea1ae4baa4a03d03644e798eeb98a4745785.tar.gz rails-3aa1ea1ae4baa4a03d03644e798eeb98a4745785.tar.bz2 rails-3aa1ea1ae4baa4a03d03644e798eeb98a4745785.zip | |
Merge branch 'rails/master' into ujs
Diffstat (limited to 'actionmailer/lib/action_mailer/deprecated_api.rb')
| -rw-r--r-- | actionmailer/lib/action_mailer/deprecated_api.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/deprecated_api.rb b/actionmailer/lib/action_mailer/deprecated_api.rb index 36eec1087e..54ad18f796 100644 --- a/actionmailer/lib/action_mailer/deprecated_api.rb +++ b/actionmailer/lib/action_mailer/deprecated_api.rb @@ -14,7 +14,7 @@ module ActionMailer def self.default_#{method}=(value) ActiveSupport::Deprecation.warn "ActionMailer::Base.default_#{method}=value is deprecated, " << - "use defaults :#{method} => value instead" + "use default :#{method} => value instead" @@default_#{method} = value end @@ -136,4 +136,4 @@ module ActionMailer end end -end
\ No newline at end of file +end |