From a0035ba52adde8d4ef06c2a6f8b7c5ba0565a257 Mon Sep 17 00:00:00 2001 From: Marius Balteanu Date: Wed, 7 Feb 2024 20:41:23 +0000 Subject: [PATCH] Includes favicon in assets pipeline (#39111). git-svn-id: https://svn.redmine.org/redmine/trunk@22692 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/application_helper.rb | 4 ++-- public/{ => images}/favicon.ico | Bin 2 files changed, 2 insertions(+), 2 deletions(-) rename public/{ => images}/favicon.ico (100%) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index bb17b8455..4054d3274 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1749,12 +1749,12 @@ module ApplicationHelper end def favicon - "".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/images/favicon.ico similarity index 100% rename from public/favicon.ico rename to public/images/favicon.ico