From f55ef82321c33a308c64e54c66b45e4fff542efa Mon Sep 17 00:00:00 2001 From: jejacks0n Date: Thu, 3 Jan 2013 20:51:44 -0700 Subject: Fixes issue where duplicate assets can be required with sprockets. - addresses the problem by calling flatten on asset array before calling uniq. - adds note to CHANGELOG. --- actionpack/CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'actionpack/CHANGELOG.md') 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* -- cgit v1.2.3