From 2263769c792a32d02826837ef8df5ae5ad1e3682 Mon Sep 17 00:00:00 2001
From: MQuy <sugiacupit@gmail.com>
Date: Thu, 1 Dec 2016 09:59:53 +0800
Subject: Add changelog for custom content type
---
actionmailer/CHANGELOG.md | 12 ++++++++++++
guides/source/5_0_release_notes.md | 4 ++++
2 files changed, 16 insertions(+)
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index 3b9f503a0b..6bef8fc7e3 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -3,4 +3,16 @@
*Jeremy Daer*
+* Mime type: allow to custom content type when setting body in headers
+ and attachments.
+
+ Example:
+
+ def test_emails
+ attachments["invoice.pdf"] = "This is test File content"
+ mail(body: "Hello there", content_type: "text/html")
+ end
+
+ *Minh Quy*
+
Please check [5-0-stable](https://github.com/rails/rails/blob/5-0-stable/actionmailer/CHANGELOG.md) for previous changes.
diff --git a/guides/source/5_0_release_notes.md b/guides/source/5_0_release_notes.md
index 39753cbd6f..960b5b3df7 100644
--- a/guides/source/5_0_release_notes.md
+++ b/guides/source/5_0_release_notes.md
@@ -533,6 +533,10 @@ Please refer to the [Changelog][action-mailer] for detailed changes.
whether your templates should perform caching or not.
([Pull Request](https://github.com/rails/rails/pull/22825))
+* Added support for custom `content_type` when setting body in
+ headers and attachments.
+ ([Pull Request](https://github.com/rails/rails/pull/27227))
+
Active Record
-------------
--
cgit v1.2.3