From d1b9c5fd119a6098a51eb2c2f7b2f52e53b8c240 Mon Sep 17 00:00:00 2001 From: Yves Senn Date: Mon, 10 Dec 2012 16:59:37 +0100 Subject: revised the actionmailer's CHANGELOG structure --- actionmailer/CHANGELOG.md | 8 +++++--- actionmailer/lib/action_mailer/base.rb | 15 ++++++++------- 2 files changed, 13 insertions(+), 10 deletions(-) (limited to 'actionmailer') diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md index fd3eca106e..1005516f42 100644 --- a/actionmailer/CHANGELOG.md +++ b/actionmailer/CHANGELOG.md @@ -1,9 +1,11 @@ +## Rails 3.2.10 (unreleased) ## + ## Rails 3.2.9 (Nov 12, 2012) ## -* Do not render views when mail() isn't called. - Fix #7761 +* Do not render views when mail() isn't called. + Fix #7761 - *Yves Senn* + *Yves Senn* ## Rails 3.2.8 (Aug 9, 2012) ## diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index a9fb49a303..1aeeadcacc 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -123,8 +123,8 @@ module ActionMailer #:nodoc: # # <%= users_url(:host => "example.com") %> # - # You should use the named_route_url style (which generates absolute URLs) and avoid using the - # named_route_path style (which generates relative URLs), since clients reading the mail will + # You should use the named_route_url style (which generates absolute URLs) and avoid using the + # named_route_path style (which generates relative URLs), since clients reading the mail will # have no concept of a current URL from which to determine a relative path. # # It is also possible to set a default host that will be used in all mailers by setting the :host @@ -133,7 +133,7 @@ module ActionMailer #:nodoc: # config.action_mailer.default_url_options = { :host => "example.com" } # # When you decide to set a default :host for your mailers, then you need to make sure to use the - # :only_path => false option when using url_for. Since the url_for view helper + # :only_path => false option when using url_for. Since the url_for view helper # will generate relative URLs by default when a :host option isn't explicitly provided, passing # :only_path => false will ensure that absolute URLs are generated. # @@ -150,8 +150,8 @@ module ActionMailer #:nodoc: # # = Multipart Emails # - # Multipart messages can also be used implicitly because Action Mailer will automatically detect and use - # multipart templates, where each template is named after the name of the action, followed by the content + # Multipart messages can also be used implicitly because Action Mailer will automatically detect and use + # multipart templates, where each template is named after the name of the action, followed by the content # type. Each such detected template will be added as a separate part to the message. # # For example, if the following templates exist: @@ -616,8 +616,9 @@ module ActionMailer #:nodoc: # end # def mail(headers={}, &block) - # Guard flag to prevent both the old and the new API from firing - # Should be removed when old API is removed + # Guard flag to prevent both the old and the new API from firing. + # On master this flag was renamed to `@_mail_was_called`. + # On master there is only one API and this flag is no longer used as a guard. @mail_was_called = true m = @_message -- cgit v1.2.3