diff options
author | Andrew White <pixeltrix@users.noreply.github.com> | 2014-07-15 09:32:01 +0100 |
---|---|---|
committer | Andrew White <pixeltrix@users.noreply.github.com> | 2014-07-15 09:32:01 +0100 |
commit | c3f4d6c8feafab9ded8b549d745c4731ee17b5c4 (patch) | |
tree | ddfcde5e00a7982cf3c8935868a811509e9cb8d2 /actionview/CHANGELOG.md | |
parent | 942b3a243403ae20b531ca5a77fcceda9fe6524d (diff) | |
parent | d005777469b7182b1a8f657a5b94363b321bef5d (diff) | |
download | rails-c3f4d6c8feafab9ded8b549d745c4731ee17b5c4.tar.gz rails-c3f4d6c8feafab9ded8b549d745c4731ee17b5c4.tar.bz2 rails-c3f4d6c8feafab9ded8b549d745c4731ee17b5c4.zip |
Merge pull request #16161 from jpawlyn/master
Fix empty host for an asset url when asset_host proc returns nil
Diffstat (limited to 'actionview/CHANGELOG.md')
-rw-r--r-- | actionview/CHANGELOG.md | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md index 5a03c313ef..3a55407491 100644 --- a/actionview/CHANGELOG.md +++ b/actionview/CHANGELOG.md @@ -1,3 +1,8 @@ +* Return an absolute instead of relative path from an asset url in the case + of the `asset_host` proc returning nil + + *Jolyon Pawlyn* + * Fix `html_escape_once` to properly handle hex escape sequences (e.g. ᨫ) *John F. Douthat* |