Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pass over AM changelog [ci skip] #24497

Merged
merged 1 commit into from
Apr 11, 2016
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 3 additions & 4 deletions actionmailer/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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*

Expand All @@ -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*
Expand Down