use favicon_link_tag to circumvent browser caching

opoloo · Aug 4, 2015 · 2687647 · 2687647
1 parent eeb1228
commit 2687647
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/public/favicon.ico → app/assets/images/favicon.ico b/public/favicon.ico → app/assets/images/favicon.ico
diff --git a/app/views/layouts/lines/application.html.erb b/app/views/layouts/lines/application.html.erb
@@ -10,7 +10,7 @@
   <meta name="geo.position" CONTENT="<%= CONFIG[:geo_position] %>">
   <meta name="geo.placename" CONTENT="<%= CONFIG[:geo_address] %>">
   <meta name="viewport" content="width=device-width, minimum-scale=1, maximum-scale=1" />
-  <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
+  <%= favicon_link_tag %>
   <%= yield :head %>
   <%= auto_discovery_link_tag(:atom, articles_url(format: "atom"), {title: CONFIG[:feed_title]}) %>
   <%= stylesheet_link_tag    "lines/application", media: "all" %>

diff --git a/app/views/layouts/lines/preview.html.erb b/app/views/layouts/lines/preview.html.erb
@@ -4,8 +4,7 @@
   <meta charset="UTF-8" />
   <%= display_meta_tags site: CONFIG[:title_short] %>
   <meta name="viewport" content="width=device-width, minimum-scale=1, maximum-scale=1" />
-  <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
-  <link rel="icon" href="/favicon.ico" type="image/x-icon">
+  <%= favicon_link_tag %>
   <%= yield :head %>
   <%= stylesheet_link_tag    "lines/application", media: "all" %>
   <%= javascript_include_tag "lines/application" %>