diff --git a/lib/mongoid/railtie.rb b/lib/mongoid/railtie.rb index c10d32b28b..a2fa9f4240 100644 --- a/lib/mongoid/railtie.rb +++ b/lib/mongoid/railtie.rb @@ -10,7 +10,7 @@ module Rails #:nodoc: module Mongoid #:nodoc: class Railtie < Rails::Railtie #:nodoc: - config.generators.orm :mongoid, :migration => false + config.app_generators.orm :mongoid, :migration => false rake_tasks do load "mongoid/railties/database.rake" diff --git a/lib/rails/mongoid.rb b/lib/rails/mongoid.rb index c3e600c54c..eb5360f9b5 100644 --- a/lib/rails/mongoid.rb +++ b/lib/rails/mongoid.rb @@ -7,7 +7,7 @@ class << self # that indexing and inheritance work in both development and production # with the same results. def load_models(app) - app.config.paths.app.models.each do |path| + app.config.paths['app/models'].each do |path| Dir.glob("#{path}/**/*.rb").sort.each do |file| require_dependency(file) end