diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-11-06 11:35:18 -0800 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-11-06 17:38:34 -0200 |
| commit | 256ae7dec5626620eb5a064f50931e1d9317b2a4 (patch) | |
| tree | f2472d1913c375e730b8ec919c4ce8f55e6a2fc7 /actionview/lib | |
| parent | 0f5a36eb4c344ab84d45adc76239a9bd82b87684 (diff) | |
| download | rails-256ae7dec5626620eb5a064f50931e1d9317b2a4.tar.gz rails-256ae7dec5626620eb5a064f50931e1d9317b2a4.tar.bz2 rails-256ae7dec5626620eb5a064f50931e1d9317b2a4.zip | |
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
Diffstat (limited to 'actionview/lib')
| -rw-r--r-- | actionview/lib/action_view/helpers/asset_tag_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionview/lib/action_view/helpers/asset_tag_helper.rb b/actionview/lib/action_view/helpers/asset_tag_helper.rb index e2430140c2..2a44ae5d5c 100644 --- a/actionview/lib/action_view/helpers/asset_tag_helper.rb +++ b/actionview/lib/action_view/helpers/asset_tag_helper.rb @@ -153,14 +153,14 @@ module ActionView # # ==== 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', { |