Serve the favicon through the assets pipeline

diff --git a/public/favicon.ico b/app/assets/images/favicon.ico
similarity index 100%
rename from public/favicon.ico
rename to app/assets/images/favicon.ico

diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb
index e315ef373fc35876135880e3a5c83c200e12c5cc..3ddb7355153c2a1bd808974691f4eaf7cbf77782 100644 (file)
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -8,6 +8,7 @@
   <%= stylesheet_link_tag "large-#{t 'html.dir'}", :media => "screen and (min-width: 642px)" %>
   <%= stylesheet_link_tag "print-#{t 'html.dir'}", :media => "print" %>
   <!--[if IE]><%= stylesheet_link_tag "large-#{t 'html.dir'}", :media => "screen" %><![endif]--> <!-- IE is totally broken with CSS media queries -->
+  <%= favicon_link_tag "favicon.ico" %>
   <%= tag("link", { :rel => "publisher", :href => "https://plus.google.com/111953119785824514010" }) %>
   <%= tag("link", { :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Search", :href => "/opensearch/osm.xml" }) %>
   <%= tag("meta", { :name => "description", :content => "OpenStreetMap is the free wiki world map." }) %>