aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorVipul A M <vipulnsward@gmail.com>2016-04-10 23:45:58 +0530
committerVipul A M <vipulnsward@gmail.com>2016-04-10 23:45:58 +0530
commit829650ebe44ec423cfe08ab628aebaedb3e36dbd (patch)
tree7c35f4b5085764619081319e80fda7f111d0500b /actionmailer
parent35b19cd1eb95ca0419e1be879fbadf92948369d7 (diff)
downloadrails-829650ebe44ec423cfe08ab628aebaedb3e36dbd.tar.gz
rails-829650ebe44ec423cfe08ab628aebaedb3e36dbd.tar.bz2
rails-829650ebe44ec423cfe08ab628aebaedb3e36dbd.zip
Pass over AM changelog
- Fixed statement about setting `config.action_mailer.default_url_options = {protocol: 'https'}` . We are just setting the protocol key to 'https', not replacing/initializing the complete config. - Fixed grammar in assert_emails changlog - Added sentence separator for code ":" [ci skip]
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/CHANGELOG.md7
1 files changed, 3 insertions, 4 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index 1fef9eae29..76d99f31c7 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -1,7 +1,7 @@
* Disallow calling `#deliver_later` after making local modifications to
the message which would be lost when the delivery job is enqueued.
- Prevents a common, hard-to-find bug like
+ Prevents a common, hard-to-find bug like:
message = Notifier.welcome(user, foo)
message.message_id = my_generated_message_id
@@ -41,8 +41,7 @@
## Rails 5.0.0.beta1 (December 18, 2015) ##
-* `config.force_ssl = true` will set
- `config.action_mailer.default_url_options = { protocol: 'https' }`.
+* `config.action_mailer.default_url_options[:protocol]` is now set to `https` if `config.force_ssl` is set to `true`.
*Andrew Kampjes*
@@ -51,7 +50,7 @@
*Chris McGrath*
-* `assert_emails` in block form use the given number as expected value.
+* `assert_emails` in block form, uses the given number as expected value.
This makes the error message much easier to understand.
*Yuji Yaginuma*