aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/CHANGELOG.md
diff options
context:
space:
mode:
Diffstat (limited to 'actionmailer/CHANGELOG.md')
-rw-r--r--actionmailer/CHANGELOG.md15
1 files changed, 11 insertions, 4 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index 1659696bfb..dc8c6bdf74 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -1,7 +1,14 @@
-* invoke mailer defaults as procs only if they are procs, do not convert
- with to_proc. That an object is convertible to a proc does not mean it's
- meant to be always used as a proc. Fixes #11533
+* Instrument the generation of Action Mailer messages. The time it takes to
+ generate a message is written to the log.
- *Alex Tsukernik*
+ *Daniel Schierbeck*
+
+* Invoke mailer defaults as procs only if they are procs, do not convert with
+ `to_proc`. That an object is convertible to a proc does not mean it's meant
+ to be always used as a proc.
+
+ Fixes #11533.
+
+ *Alex Tsukernik*
Please check [4-0-stable](https://github.com/rails/rails/blob/4-0-stable/actionmailer/CHANGELOG.md) for previous changes.