diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-12-08 07:24:41 -0800 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-12-08 07:24:41 -0800 |
commit | 40991dd4bcbd2d9de0d9ba1b775a103532d9fae7 (patch) | |
tree | a9ebf2deafa6a04bde975886d3fc98b630683ece /actionmailer/lib | |
parent | bef330803ae4a30bfeaf6dd9c86077cfb5e250e1 (diff) | |
parent | 4ec7493e3cb9366df604f9f3082b4cd6f6dfd4fd (diff) | |
download | rails-40991dd4bcbd2d9de0d9ba1b775a103532d9fae7.tar.gz rails-40991dd4bcbd2d9de0d9ba1b775a103532d9fae7.tar.bz2 rails-40991dd4bcbd2d9de0d9ba1b775a103532d9fae7.zip |
Merge pull request #8465 from frodsan/update_am_action_callbacks
use _action callbacks in actionmailer
Diffstat (limited to 'actionmailer/lib')
-rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 31005c9d9b..dcf13e927c 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -284,12 +284,12 @@ module ActionMailer # # = Callbacks # - # You can specify callbacks using before_filter and after_filter for configuring your messages. + # You can specify callbacks using before_action and after_action for configuring your messages. # This may be useful, for example, when you want to add default inline attachments for all # messages sent out by a certain mailer class: # # class Notifier < ActionMailer::Base - # before_filter :add_inline_attachment! + # before_action :add_inline_attachment! # # def welcome # mail @@ -306,8 +306,8 @@ module ActionMailer # can define and configure callbacks in the same manner that you would use callbacks in # classes that inherit from ActionController::Base. # - # Note that unless you have a specific reason to do so, you should prefer using before_filter - # rather than after_filter in your ActionMailer classes so that headers are parsed properly. + # Note that unless you have a specific reason to do so, you should prefer using before_action + # rather than after_action in your ActionMailer classes so that headers are parsed properly. # # = Configuration options # |