aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/CHANGELOG.md
diff options
context:
space:
mode:
authorAndrew White <andyw@pixeltrix.co.uk>2013-03-19 18:48:49 -0700
committerAndrew White <andyw@pixeltrix.co.uk>2013-03-19 18:48:49 -0700
commit730f725509f7c504837510a466bd693551bacb82 (patch)
tree729d90038ed631b627bf2a8dacbe3c2d4ed4fb3b /actionpack/CHANGELOG.md
parentbdf1a2e7b9096889321f7653a0ccca628a089e2f (diff)
parent334549b4a56ae753b564b6beeded88322306c7cb (diff)
downloadrails-730f725509f7c504837510a466bd693551bacb82.tar.gz
rails-730f725509f7c504837510a466bd693551bacb82.tar.bz2
rails-730f725509f7c504837510a466bd693551bacb82.zip
Merge pull request #9794 from schneems/schneems/email-host
Fix improperly configured host in generated urls
Diffstat (limited to 'actionpack/CHANGELOG.md')
-rw-r--r--actionpack/CHANGELOG.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 97bd2bf97f..0c6973f9b6 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,5 +1,11 @@
## Rails 4.0.0 (unreleased) ##
+* Allow default url options to accept host with protocol such as `http://`
+
+ config.action_mailer.default_url_options = { host: "http://mydomain.com" }
+
+ *Richard Schneeman*
+
* Ensure that digest authentication responds with a 401 status when a basic
header is received.