Merged r17841 from trunk to 4.0-stable (#30725).

git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17842 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2019-02-01 10:12:38 +00:00
parent e90c06dbb3
commit 0ed5992f4e

View File

@@ -110,7 +110,7 @@ module Redmine
# Adds the app/{controllers,helpers,models} directories of the plugin to the autoload path
Dir.glob File.expand_path(File.join(p.directory, 'app', '{controllers,helpers,models}')) do |dir|
ActiveSupport::Dependencies.autoload_paths += [dir]
Rails.application.config.eager_load_paths += [dir] if Rails.env == 'production'
Rails.application.config.eager_load_paths += [dir] if Rails.application.config.eager_load
end
# Defines plugin setting if present