Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #12788 from kylefritz/patch-1

rdoc: favicon source shouldn't begin with a slash to reference asset pipeline resource [ci skip]
Conflicts:
	actionview/lib/action_view/helpers/asset_tag_helper.rb
  • Loading branch information...
commit 256ae7dec5626620eb5a064f50931e1d9317b2a4 1 parent 0f5a36e
@rafaelfranca rafaelfranca authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 actionview/lib/action_view/helpers/asset_tag_helper.rb
View
4 actionview/lib/action_view/helpers/asset_tag_helper.rb
@@ -153,14 +153,14 @@ def auto_discovery_link_tag(type = :rss, url_options = {}, tag_options = {})
#
# ==== Examples
#
- # favicon_link_tag '/myicon.ico'
+ # favicon_link_tag 'myicon.ico'
# # => <link href="/assets/myicon.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.
# The following call would generate such a tag:
#
- # favicon_link_tag '/mb-icon.png', rel: 'apple-touch-icon', type: 'image/png'
+ # 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={})
tag('link', {
Please sign in to comment.
Something went wrong with that request. Please try again.