diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2013-02-20 15:47:56 -0200 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2013-02-20 15:51:51 -0200 |
| commit | 6871bd9818a9a7d9d8c7e21e253d64c0410fde1d (patch) | |
| tree | ff3946c5479c4152975794129c994518c99a2fd3 /actionpack/test/template/asset_tag_helper_test.rb | |
| parent | d3563bd661a858d41547fa21f3fedb2e6fcd8b8e (diff) | |
| download | rails-6871bd9818a9a7d9d8c7e21e253d64c0410fde1d.tar.gz rails-6871bd9818a9a7d9d8c7e21e253d64c0410fde1d.tar.bz2 rails-6871bd9818a9a7d9d8c7e21e253d64c0410fde1d.zip | |
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
Diffstat (limited to 'actionpack/test/template/asset_tag_helper_test.rb')
| -rw-r--r-- | actionpack/test/template/asset_tag_helper_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb index 11614a45dc..185f742c7f 100644 --- a/actionpack/test/template/asset_tag_helper_test.rb +++ b/actionpack/test/template/asset_tag_helper_test.rb @@ -200,7 +200,7 @@ class AssetTagHelperTest < ActionView::TestCase } FaviconLinkToTag = { - %(favicon_link_tag) => %(<link href="/images/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" />), + %(favicon_link_tag) => %(<link href="/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" />), %(favicon_link_tag 'favicon.ico') => %(<link href="/images/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" />), %(favicon_link_tag 'favicon.ico', :rel => 'foo') => %(<link href="/images/favicon.ico" rel="foo" type="image/vnd.microsoft.icon" />), %(favicon_link_tag 'favicon.ico', :rel => 'foo', :type => 'bar') => %(<link href="/images/favicon.ico" rel="foo" type="bar" />), |