diff options
author | Xavier Noria <fxn@hashref.com> | 2010-06-22 23:17:20 +0200 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2010-06-24 00:17:28 +0200 |
commit | 6f83a5036d8a9c3f8ed74755ff6d42bc3f6e9982 (patch) | |
tree | 08916d1c4d01a93af7f2b4d830417b7d32f271d1 /railties/lib/rails/application | |
parent | 4a0a640d33e1c729d38c6091bb1394fbda059b5c (diff) | |
download | rails-6f83a5036d8a9c3f8ed74755ff6d42bc3f6e9982.tar.gz rails-6f83a5036d8a9c3f8ed74755ff6d42bc3f6e9982.tar.bz2 rails-6f83a5036d8a9c3f8ed74755ff6d42bc3f6e9982.zip |
renames load_(once_)paths to autoload_(once_)paths in dependencies and config
Diffstat (limited to 'railties/lib/rails/application')
-rw-r--r-- | railties/lib/rails/application/finisher.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb index 11a3329de6..855467227b 100644 --- a/railties/lib/rails/application/finisher.rb +++ b/railties/lib/rails/application/finisher.rb @@ -7,14 +7,14 @@ module Rails config.generators.templates.unshift(*paths.lib.templates.to_a) end - initializer :ensure_load_once_paths_as_subset do - extra = ActiveSupport::Dependencies.load_once_paths - - ActiveSupport::Dependencies.load_paths + initializer :ensure_autoload_once_paths_as_subset do + extra = ActiveSupport::Dependencies.autoload_once_paths - + ActiveSupport::Dependencies.autoload_paths unless extra.empty? abort <<-end_error - load_once_paths must be a subset of the load_paths. - Extra items in load_once_paths: #{extra * ','} + autoload_once_paths must be a subset of the autoload_paths. + Extra items in autoload_once_paths: #{extra * ','} end_error end end |