summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2022-12-23 01:41:02 +0000
committerGo MAEDA <maeda@farend.jp>2022-12-23 01:41:02 +0000
commitec88efbb58dc43867710b5fd519192eccee0b1a1 (patch)
tree721b93a1df1bf209f69908452acf0c0d88538772
parent5034844794a59431874029eab1371fed4259a39b (diff)
downloadredmine-ec88efbb58dc43867710b5fd519192eccee0b1a1.tar.gz
redmine-ec88efbb58dc43867710b5fd519192eccee0b1a1.zip
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
-rw-r--r--config/initializers/zeitwerk.rb1
-rw-r--r--lib/redmine/plugin_loader.rb1
2 files changed, 2 insertions, 0 deletions
diff --git a/config/initializers/zeitwerk.rb b/config/initializers/zeitwerk.rb
index f5630b3ee..ab86b28e2 100644
--- 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 ea6c4a8b2..cb461bc0b 100644
--- 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