diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-04-06 11:14:03 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-04-06 11:14:03 -0700 |
| commit | d4269db86a4e27c3a3a28c5015826c83f465ce7f (patch) | |
| tree | ee360d6d1f5cc9b2fafb62e334ac1254c7467116 /actionpack/lib/action_view | |
| parent | 575838795019f7402992e3bfa83a0c5048cf143d (diff) | |
| parent | defea35a3956d7b6d997dcad9b15030638bb185b (diff) | |
| download | rails-d4269db86a4e27c3a3a28c5015826c83f465ce7f.tar.gz rails-d4269db86a4e27c3a3a28c5015826c83f465ce7f.tar.bz2 rails-d4269db86a4e27c3a3a28c5015826c83f465ce7f.zip | |
Merge pull request #10120 from vipulnsward/change_merge_on_new_hash
change some more merge to merge! on new hashes
Diffstat (limited to 'actionpack/lib/action_view')
| -rw-r--r-- | actionpack/lib/action_view/helpers/asset_tag_helper.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb index 31e37893c6..521eaf25d2 100644 --- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb @@ -58,7 +58,7 @@ module ActionView sources.uniq.map { |source| tag_options = { "src" => path_to_javascript(source, path_options) - }.merge(options) + }.merge!(options) content_tag(:script, "", tag_options) }.join("\n").html_safe end @@ -98,7 +98,7 @@ module ActionView "rel" => "stylesheet", "media" => "screen", "href" => path_to_stylesheet(source, path_options) - }.merge(options) + }.merge!(options) tag(:link, tag_options) }.join("\n").html_safe end @@ -166,7 +166,7 @@ module ActionView :rel => 'shortcut icon', :type => 'image/vnd.microsoft.icon', :href => path_to_image(source) - }.merge(options.symbolize_keys)) + }.merge!(options.symbolize_keys)) end # Returns an HTML image tag for the +source+. The +source+ can be a full |