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/test/fixtures/sprockets/app/javascripts/extra.js | 1 + actionpack/test/fixtures/sprockets/app/stylesheets/extra.css | 1 + 2 files changed, 2 insertions(+) (limited to 'actionpack/test/fixtures/sprockets') diff --git a/actionpack/test/fixtures/sprockets/app/javascripts/extra.js b/actionpack/test/fixtures/sprockets/app/javascripts/extra.js index e69de29bb2..e611d2b129 100644 --- a/actionpack/test/fixtures/sprockets/app/javascripts/extra.js +++ b/actionpack/test/fixtures/sprockets/app/javascripts/extra.js @@ -0,0 +1 @@ +//= require xmlhr diff --git a/actionpack/test/fixtures/sprockets/app/stylesheets/extra.css b/actionpack/test/fixtures/sprockets/app/stylesheets/extra.css index e69de29bb2..2365eaa4cd 100644 --- a/actionpack/test/fixtures/sprockets/app/stylesheets/extra.css +++ b/actionpack/test/fixtures/sprockets/app/stylesheets/extra.css @@ -0,0 +1 @@ +/*= require style */ -- cgit v1.2.3