kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #12788 from kylefritz/patch-1

Browse source 
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
This commit is contained in:
Rafael Mendonça França 2013-11-06 11:35:18 -08:00
parent 0f5a36eb4c
commit 256ae7dec5
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
actionview/lib/action_view/helpers/asset_tag_helper.rb
View file

@ -153,14 +153,14 @@ module ActionView
# #
# ==== Examples # ==== Examples
# #
# favicon_link_tag '/myicon.ico' # favicon_link_tag 'myicon.ico'
# # => <link href="/assets/myicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" /> # # => <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 # 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. # 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: # 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" /> # # => <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', { tag('link', {