Merged r17958 to 4.0-stable (#30753).

git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17959 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/redmine/plugin.rb b/lib/redmine/plugin.rb
index 82bcde81f66b43d991e4eec9aef9db3109f4163d..073eb3eb614822ba90b49c37438c3ee784fe50bb 100644 (file)
--- a/lib/redmine/plugin.rb
+++ b/lib/redmine/plugin.rb
@@ -109,6 +109,7 @@ module Redmine
 
       # Add the plugin directories to rails autoload paths
       engine_cfg = Rails::Engine::Configuration.new(p.directory)
+      engine_cfg.paths.add 'lib', eager_load: true
       Rails.application.config.eager_load_paths += engine_cfg.eager_load_paths
       Rails.application.config.autoload_once_paths += engine_cfg.autoload_once_paths
       Rails.application.config.autoload_paths += engine_cfg.autoload_paths