diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2013-02-21 15:34:02 -0200 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2013-02-21 15:34:02 -0200 |
| commit | 389397952460d09218bb407be1142e0b62cf3f4f (patch) | |
| tree | 6247bebf882c76388d6a654cc3cb74629bf11d40 /actionpack/lib/action_view/helpers/asset_tag_helper.rb | |
| parent | c60be72c5243c21303b067c9c5cc398111cf48c8 (diff) | |
| download | rails-389397952460d09218bb407be1142e0b62cf3f4f.tar.gz rails-389397952460d09218bb407be1142e0b62cf3f4f.tar.bz2 rails-389397952460d09218bb407be1142e0b62cf3f4f.zip | |
Revert "Revert "Merge pull request #4803 from lucascaton/master""
This reverts commit 6871bd9818a9a7d9d8c7e21e253d64c0410fde1d.
Diffstat (limited to 'actionpack/lib/action_view/helpers/asset_tag_helper.rb')
| -rw-r--r-- | actionpack/lib/action_view/helpers/asset_tag_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb index bf78c00e4d..31e37893c6 100644 --- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb @@ -152,7 +152,7 @@ module ActionView # * <tt>:type</tt> - Override the auto-generated mime type, defaults to 'image/vnd.microsoft.icon' # # favicon_link_tag '/myicon.ico' - # # => <link href="/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" /> + # # => <link href="/assets/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" /> # # Mobile Safari looks for a different <link> tag, pointing to an image that # will be used if you add the page to the home screen of an iPod Touch, iPhone, or iPad. @@ -161,7 +161,7 @@ module ActionView # favicon_link_tag '/mb-icon.png', rel: 'apple-touch-icon', type: 'image/png' # # => <link href="/assets/mb-icon.png" rel="apple-touch-icon" type="image/png" /> # - def favicon_link_tag(source='/favicon.ico', options={}) + def favicon_link_tag(source='favicon.ico', options={}) tag('link', { :rel => 'shortcut icon', :type => 'image/vnd.microsoft.icon', |