aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/CHANGELOG.md
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-10-28 12:55:53 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-10-28 17:58:48 -0200
commit37586ddf279c46c3d0c8c2553d0918aa82ceb020 (patch)
tree007e6b8a334dfe24703491e8df635b5bd8114b23 /actionmailer/CHANGELOG.md
parent2b5d3aa442625169125ff0be95fe30f7d462ea54 (diff)
downloadrails-37586ddf279c46c3d0c8c2553d0918aa82ceb020.tar.gz
rails-37586ddf279c46c3d0c8c2553d0918aa82ceb020.tar.bz2
rails-37586ddf279c46c3d0c8c2553d0918aa82ceb020.zip
Merge pull request #8048 from senny/7761_dont_render_view_without_mail_call
Do not render views when mail() isn't called. (NullMail refactoring) Conflicts: actionmailer/CHANGELOG.md
Diffstat (limited to 'actionmailer/CHANGELOG.md')
-rw-r--r--actionmailer/CHANGELOG.md11
1 files changed, 11 insertions, 0 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index d938ffbb4c..74aede2cb7 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -1,15 +1,26 @@
+## Rails 3.2.9 (unreleased) ##
+
+* Do not render views when mail() isn't called.
+ Fix #7761
+
+ *Yves Senn*
+
+
## Rails 3.2.8 (Aug 9, 2012) ##
* No changes.
+
## Rails 3.2.7 (Jul 26, 2012) ##
* No changes.
+
## Rails 3.2.6 (Jun 12, 2012) ##
* No changes.
+
## Rails 3.2.5 (Jun 1, 2012) ##
* No changes.