diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-05-09 12:36:20 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-05-09 12:36:20 -0700 |
| commit | f8dae865b5f33bd1846e93aa19dcdb52a5665461 (patch) | |
| tree | 3268cc852127fe2433e5b06ba266910b7193b2b2 /actionpack/lib | |
| parent | 8f5079f190c849b2fb4de24739af742cc5a9e37b (diff) | |
| parent | 0621ecb20bd76a3d294fbbed73e54fe81a3cb6d2 (diff) | |
| download | rails-f8dae865b5f33bd1846e93aa19dcdb52a5665461.tar.gz rails-f8dae865b5f33bd1846e93aa19dcdb52a5665461.tar.bz2 rails-f8dae865b5f33bd1846e93aa19dcdb52a5665461.zip | |
Merge pull request #6149 from jmbejar/javascript_include_tag_with_not_duplicates
Make sure that javascript_include_tag/stylesheet_link_tag methods don't consider duplicated assets
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/sprockets/helpers/rails_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb index 3402343494..4e11221842 100644 --- a/actionpack/lib/sprockets/helpers/rails_helper.rb +++ b/actionpack/lib/sprockets/helpers/rails_helper.rb @@ -31,7 +31,7 @@ module Sprockets else super(source.to_s, { :src => path_to_asset(source, :ext => 'js', :body => body, :digest => digest) }.merge!(options)) end - end.join("\n").html_safe + end.uniq.join("\n").html_safe end def stylesheet_link_tag(*sources) @@ -48,7 +48,7 @@ module Sprockets else super(source.to_s, { :href => path_to_asset(source, :ext => 'css', :body => body, :protocol => :request, :digest => digest) }.merge!(options)) end - end.join("\n").html_safe + end.uniq.join("\n").html_safe end def asset_path(source, options = {}) |