mirror of
https://github.com/meineerde/redmine.git
synced 2026-02-01 03:57:15 +00:00
Merged r23212 from trunk to 6.0-stable (#39111).
git-svn-id: https://svn.redmine.org/redmine/branches/6.0-stable@23213 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
commit
b8821120d9
@ -122,13 +122,13 @@ module Propshaft
|
||||
Assembly.prepend(Module.new do
|
||||
def initialize(config)
|
||||
super
|
||||
if Rails.application.config.assets.redmine_detect_update && (!manifest_path.exist? || manifest_outdated?)
|
||||
if Rails.application.config.assets.redmine_detect_update && (!config.manifest_path.exist? || manifest_outdated?)
|
||||
processor.process
|
||||
end
|
||||
end
|
||||
|
||||
def manifest_outdated?
|
||||
!!load_path.asset_files.detect{|f| f.mtime > manifest_path.mtime}
|
||||
!!load_path.asset_files.detect{|f| f.mtime > config.manifest_path.mtime}
|
||||
end
|
||||
|
||||
def load_path
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user