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/test/fixtures/sprockets/app | |
| 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/test/fixtures/sprockets/app')
| -rw-r--r-- | actionpack/test/fixtures/sprockets/app/javascripts/extra.js | 1 | ||||
| -rw-r--r-- | actionpack/test/fixtures/sprockets/app/stylesheets/extra.css | 1 |
2 files changed, 2 insertions, 0 deletions
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 */ |