diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-01-10 12:43:31 -0800 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-01-10 12:43:31 -0800 |
| commit | 002dfba66490d289bac897d1ba886310a672e779 (patch) | |
| tree | b03852e20e717e0daeccf78eb2ccd00d5acdff86 /actionpack/CHANGELOG.md | |
| parent | 11f5debcd5bbfaf51d2d2f24f2c5cee38f37fcdb (diff) | |
| parent | f55ef82321c33a308c64e54c66b45e4fff542efa (diff) | |
| download | rails-002dfba66490d289bac897d1ba886310a672e779.tar.gz rails-002dfba66490d289bac897d1ba886310a672e779.tar.bz2 rails-002dfba66490d289bac897d1ba886310a672e779.zip | |
Merge pull request #8735 from jejacks0n/duplicate_asset_fix
Ensure assets aren't duplicated when using sprockets require.
Diffstat (limited to 'actionpack/CHANGELOG.md')
| -rw-r--r-- | actionpack/CHANGELOG.md | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 5ff1a06c62..b887a5837a 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -5,6 +5,9 @@ *Sam Ruby + Carlos Antonio da Silva* * Do not append second slash to `root_url` when using `trailing_slash: true` + +* Do not append second slash to root_url when using `trailing_slash: true` + Fix #8700. Backport #8701. @@ -17,6 +20,10 @@ *Yves Senn* +* Fixes issue where duplicate assets can be required with sprockets. + + *Jeremy Jackson* + * Fix a bug in `content_tag_for` that prevents it for work without a block. *Jasl* |