aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/CHANGELOG.md
diff options
context:
space:
mode:
authorAndrew Kampjes <a.kampjes@gmail.com>2014-10-25 23:14:05 +1300
committerAndrew Kampjes <a.kampjes@gmail.com>2015-08-14 08:05:11 +1200
commitf0a3af209f021774f0f2360d8843a3f630312431 (patch)
tree4630f56d27d07f1322eaeb56a84c17c0b63ce643 /actionmailer/CHANGELOG.md
parente50fe85180648be0c4216bd0111f05be1df0988a (diff)
downloadrails-f0a3af209f021774f0f2360d8843a3f630312431.tar.gz
rails-f0a3af209f021774f0f2360d8843a3f630312431.tar.bz2
rails-f0a3af209f021774f0f2360d8843a3f630312431.zip
ActionMailer https on URL with force_ssl = true
`config.force_ssl = true` will set config.action_mailer.default_url_options = { protocol: 'https' } If you have turned on force_ssl, and then gone to the effort of setting config.action_mailer.default_url_options = {host: 'example.com'} then you are probably pointing people back to your current app and want https on that too.
Diffstat (limited to 'actionmailer/CHANGELOG.md')
-rw-r--r--actionmailer/CHANGELOG.md5
1 files changed, 5 insertions, 0 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index 7c1b0b215a..0ecb0235bc 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -1,3 +1,8 @@
+* `config.force_ssl = true` will set
+ `config.action_mailer.default_url_options = { protocol: 'https' }`
+
+ *Andrew Kampjes*
+
* Add `config.action_mailer.deliver_later_queue_name` configuration to set the
mailer queue name.