aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/CHANGELOG.md
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-05-16 13:31:06 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-05-16 13:31:20 -0300
commit3acf28773b5eebb09f720b7e343b9f3a1911d2e0 (patch)
tree967c722dc573cfed3e627cf9930ee50d74b54ece /actionview/CHANGELOG.md
parent8c48cd220648dc05c17def63d653fa98c3fab4de (diff)
parentdb9a5c5a1f8e2a1590f0ac9436587d58a67a629e (diff)
downloadrails-3acf28773b5eebb09f720b7e343b9f3a1911d2e0.tar.gz
rails-3acf28773b5eebb09f720b7e343b9f3a1911d2e0.tar.bz2
rails-3acf28773b5eebb09f720b7e343b9f3a1911d2e0.zip
Merge pull request #15021 from hubertlepicki/allow_custom_host_in_asset_url
Allow custom asset host to be passed in asset_url
Diffstat (limited to 'actionview/CHANGELOG.md')
-rw-r--r--actionview/CHANGELOG.md6
1 files changed, 5 insertions, 1 deletions
diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md
index e5740e30c6..147e5b47db 100644
--- a/actionview/CHANGELOG.md
+++ b/actionview/CHANGELOG.md
@@ -1,3 +1,8 @@
+* Allow custom `:host` option to be passed to `asset_url` helper that
+ overwrites `config.action_controller.asset_host` for particular asset.
+
+ *Hubert Łępicki*
+
* Deprecate `AbstractController::Base.parent_prefixes`.
Override `AbstractController::Base.local_prefixes` when you want to change
where to find views.
@@ -95,5 +100,4 @@
*Piotr Chmolowski, Łukasz Strzałkowski*
-
Please check [4-1-stable](https://github.com/rails/rails/blob/4-1-stable/actionview/CHANGELOG.md) for previous changes.