diff options
| author | aditya-kapoor <aditya.kapoor@vinsol.com> | 2013-12-10 11:44:07 +0530 |
|---|---|---|
| committer | aditya-kapoor <aditya.kapoor@vinsol.com> | 2013-12-10 11:44:07 +0530 |
| commit | 0c55335074ed7baf2f165ada168f726f1f7bba68 (patch) | |
| tree | 2a8428d72f6890cb0eb6c5b9b1d40b7b2ce93d8b /actionmailer/CHANGELOG.md | |
| parent | 6b9b0767bf480d53029afeb3f8e86f66e933fb41 (diff) | |
| parent | fe077b50c9ce65c4ac1cc718c34dda45cd24c6fe (diff) | |
| download | rails-0c55335074ed7baf2f165ada168f726f1f7bba68.tar.gz rails-0c55335074ed7baf2f165ada168f726f1f7bba68.tar.bz2 rails-0c55335074ed7baf2f165ada168f726f1f7bba68.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionmailer/CHANGELOG.md')
| -rw-r--r-- | actionmailer/CHANGELOG.md | 15 |
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. |