From 9155b777e6d156d400c6f5eb4e6b1e161bf0b32a Mon Sep 17 00:00:00 2001 From: Marius Balteanu Date: Tue, 13 Feb 2024 23:11:28 +0000 Subject: [PATCH] Custom themes are now loaded from "/themes" directory from project root. The themes provided by Redmine (alternate and classic) remains in "app/assets/themes" (#39111). git-svn-id: https://svn.redmine.org/redmine/trunk@22708 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/themes.rb | 2 +- {app/assets/themes => themes}/README | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename {app/assets/themes => themes}/README (100%) diff --git a/lib/redmine/themes.rb b/lib/redmine/themes.rb index 57fcd80d7..873409d1e 100644 --- a/lib/redmine/themes.rb +++ b/lib/redmine/themes.rb @@ -148,7 +148,7 @@ module Redmine end def self.scan_themes - dirs = Dir.glob("#{Rails.root}/app/assets/themes/*").select do |f| + dirs = Dir.glob(["#{Rails.root}/app/assets/themes/*", "#{Rails.root}/themes/*"]).select do |f| # A theme should at least override application.css File.directory?(f) && File.exist?("#{f}/stylesheets/application.css") end diff --git a/app/assets/themes/README b/themes/README similarity index 100% rename from app/assets/themes/README rename to themes/README