diff options
| author | Vipul A M <vipulnsward@gmail.com> | 2013-04-06 23:19:57 +0530 |
|---|---|---|
| committer | Vipul A M <vipulnsward@gmail.com> | 2013-04-06 23:37:39 +0530 |
| commit | defea35a3956d7b6d997dcad9b15030638bb185b (patch) | |
| tree | 4548f9be7194382a58d53421dd0b789030621ddd /actionpack | |
| parent | ec8f59ca530316a14672686611c629abc4112950 (diff) | |
| download | rails-defea35a3956d7b6d997dcad9b15030638bb185b.tar.gz rails-defea35a3956d7b6d997dcad9b15030638bb185b.tar.bz2 rails-defea35a3956d7b6d997dcad9b15030638bb185b.zip | |
change some more merge to merge! on new hashes
Diffstat (limited to 'actionpack')
| -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 |