Merged r21992 from trunk to 5.0-stable (#36273).

git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@21997 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/config/initializers/zeitwerk.rb b/config/initializers/zeitwerk.rb
index f5630b3ee76c942d2f9b141078984b797ae72cf2..ab86b28e2ba7fe79ea83a45e6f157194b98e9a41 100644 (file)
--- a/config/initializers/zeitwerk.rb
+++ b/config/initializers/zeitwerk.rb
@@ -2,6 +2,7 @@
 
 lib = Rails.root.join('lib/redmine')
 Rails.autoloaders.main.push_dir lib, namespace: Redmine
+Rails.application.config.watchable_dirs[lib] = [:rb]
 
 IGNORE_LIST = [
   'wiki_formatting/textile/redcloth3.rb',

diff --git a/lib/redmine/plugin_loader.rb b/lib/redmine/plugin_loader.rb
index ea6c4a8b20ef4881082f97b01de2e5e034f5bd2e..cb461bc0bb2a3a9be8907677e13e04c140fee834 100644 (file)
--- a/lib/redmine/plugin_loader.rb
+++ b/lib/redmine/plugin_loader.rb
@@ -128,6 +128,7 @@ module Redmine
         engine_cfg.paths.add 'lib', eager_load: true
         engine_cfg.eager_load_paths.each do |dir|
           Rails.autoloaders.main.push_dir dir
+          Rails.application.config.watchable_dirs[dir] = [:rb]
         end
       end
     end