diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2014-08-29 14:54:08 -0700 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2014-08-29 14:54:08 -0700 |
| commit | 7475b43cdbbbf7456e798210cb97ef20f2225166 (patch) | |
| tree | 04ae517943ccc476ca0a8b9b3bdbb21949a558c1 /actionmailer/CHANGELOG.md | |
| parent | 6a23bf0f4c33151e0cec0648e271dc6f5ab3f686 (diff) | |
| parent | 4445478df311a74797d8dc4945c40662f9c1442a (diff) | |
| download | rails-7475b43cdbbbf7456e798210cb97ef20f2225166.tar.gz rails-7475b43cdbbbf7456e798210cb97ef20f2225166.tar.bz2 rails-7475b43cdbbbf7456e798210cb97ef20f2225166.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionmailer/CHANGELOG.md')
| -rw-r--r-- | actionmailer/CHANGELOG.md | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md index a4923de045..1ff4db41a3 100644 --- a/actionmailer/CHANGELOG.md +++ b/actionmailer/CHANGELOG.md @@ -1,7 +1,9 @@ -* Added #deliver_later in addition to #deliver, which will enqueue a job to render and - deliver the mail instead of delivering it right at that moment. The job is enqueued - using the new Active Job framework in Rails, and will use whatever queue is configured for Rails. - +* Added #deliver_later, #deliver_now and deprecate #deliver in favour of + #deliver_now. #deliver_later will enqueue a job to render and deliver + the mail instead of delivering it right at that moment. The job is enqueued + using the new Active Job framework in Rails, and will use whatever queue is + configured for Rails. + *DHH/Abdelkader Boudih/Cristian Bica* * Make ActionMailer::Previews methods class methods. Previously they were |