From 6871bd9818a9a7d9d8c7e21e253d64c0410fde1d Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Wed, 20 Feb 2013 15:47:56 -0200 Subject: Revert "Merge pull request #4803 from lucascaton/master" This reverts commit bb842e8d2111e50b21a14b8bd6d89371a4b9cd68, reversing changes made to 40c287c7983c20c498f6a8a2ea49e9a6455347f7. This was causing issues in one of our apps we just upgraded. ActionController::RoutingError: No route matches [GET] "/images/favicon.ico" favicon_link_tag now returns '/images/favicon.ico' and in 3.2 returned '/favicon.ico' Browsers by default look for favicon.ico in the root directory Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_view/helpers/asset_tag_helper.rb --- actionpack/lib/action_view/helpers/asset_tag_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'actionpack/lib/action_view') diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb index 31e37893c6..bf78c00e4d 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 # * :type - Override the auto-generated mime type, defaults to 'image/vnd.microsoft.icon' # # favicon_link_tag '/myicon.ico' - # # => + # # => # # Mobile Safari looks for a different 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' # # => # - 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', -- cgit v1.2.3