Includes favicon in assets pipeline (#39111).

git-svn-id: https://svn.redmine.org/redmine/trunk@22692 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index bb17b845585a7cb82a31a40f4a5c71fcb50fc112..4054d3274d9f3693f243d8e3fbd28ebeffd7d222 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1749,12 +1749,12 @@ module ApplicationHelper
   end
 
   def favicon
-    "<link rel='shortcut icon' href='#{favicon_path}' />".html_safe
+    favicon_link_tag(favicon_path, rel: "icon shortcut")
   end
 
   # Returns the path to the favicon
   def favicon_path
-    icon = (current_theme && current_theme.favicon?) ? current_theme.favicon_path : '/favicon.ico'
+    icon = (current_theme && current_theme.favicon?) ? current_theme.favicon_path : 'favicon.ico'
     image_path(icon)
   end
 

diff --git a/public/favicon.ico b/public/favicon.ico
deleted file mode 100644 (file)
index 9d48fcf..0000000
Binary files a/public/favicon.ico and /dev/null differ

diff --git a/public/images/favicon.ico b/public/images/favicon.ico
new file mode 100644 (file)
index 0000000..9d48fcf
Binary files /dev/null and b/public/images/favicon.ico differ