From 5c54db290f4e7cdd69b461d4c0b020a9cd364537 Mon Sep 17 00:00:00 2001 From: Marcus Ilgner Date: Tue, 8 Dec 2015 12:28:00 +0100 Subject: ActionMailer: support overriding template name in multipart Implicit rendering in multipart blocks now also uses the template name from the options hash instead of always using the action name. So you can now write mail(template_name: template_name) do |format| format.text format.html end --- actionmailer/CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'actionmailer/CHANGELOG.md') diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md index 0ecb0235bc..b19d6b87c0 100644 --- a/actionmailer/CHANGELOG.md +++ b/actionmailer/CHANGELOG.md @@ -1,3 +1,8 @@ +* Mails with multipart `format` blocks with implicit render now also check for + a template name in options hash instead of only using the action name. + + *Marcus Ilgner* + * `config.force_ssl = true` will set `config.action_mailer.default_url_options = { protocol: 'https' }` -- cgit v1.2.3