Merge 517e9a7 into 9e1c66e

railsadminteam · Nov 15, 2016 · fe743a7 · fe743a7
2 parents 9e1c66e + 517e9a7
commit fe743a7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/rails_admin/config.rb b/lib/rails_admin/config.rb
@@ -323,7 +323,7 @@ def viable_models
         included_models.collect(&:to_s).presence || begin
           @@system_models ||= # memoization for tests
             ([Rails.application] + Rails::Engine.subclasses.collect(&:instance)).flat_map do |app|
-              (app.paths['app/models'].to_a + app.config.autoload_paths).collect do |load_path|
+              (app.paths['app/models'].to_a + app.paths.eager_load).collect do |load_path|
                 Dir.glob(app.root.join(load_path)).collect do |load_dir|
                   Dir.glob(load_dir + '/**/*.rb').collect do |filename|
                     # app/models/module/class.rb => module/class.rb => module/class => Module::Class