diff options
| author | José Valim <jose.valim@gmail.com> | 2010-06-28 00:57:47 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-06-28 01:22:32 +0200 |
| commit | 9b19a6f16cebf4257d2f0b839f6cc8ff5db5c47b (patch) | |
| tree | 98028044107a83c44f658e077a587c65d27d31b3 /railties/lib/rails/application | |
| parent | 4329f8133fee8e4f3e558787f67de59f0c4a4dd1 (diff) | |
| download | rails-9b19a6f16cebf4257d2f0b839f6cc8ff5db5c47b.tar.gz rails-9b19a6f16cebf4257d2f0b839f6cc8ff5db5c47b.tar.bz2 rails-9b19a6f16cebf4257d2f0b839f6cc8ff5db5c47b.zip | |
A few changes were done in this commit:
* Added :autoload to engines path API and redefine usage to be in sync with 6f83a5036d8a9c3f8ed7;
* Do not autoload code in *lib* for applications (now you need to explicitly require them). This makes an application behave closer to an engine (code in lib is still autoloaded for plugins);
* Always autoload code in app/ for engines and plugins. This makes engines behave closer to an application and should allow us to get rid of the unloadable hack required when controllers inside engines inherit from ApplicationController;
Diffstat (limited to 'railties/lib/rails/application')
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index e3165b2d4c..465851c0e6 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -10,7 +10,7 @@ module Rails attr_accessor :allow_concurrency, :cache_classes, :cache_store, :encoding, :consider_all_requests_local, :dependency_loading, :filter_parameters, :log_level, :logger, :middleware, - :plugins, :preload_frameworks, :reload_engines, :reload_plugins, + :plugins, :preload_frameworks, :reload_plugins, :secret_token, :serve_static_assets, :session_options, :time_zone, :whiny_nils @@ -59,7 +59,7 @@ module Rails if File.exists?("#{root}/test/mocks/#{Rails.env}") ActiveSupport::Deprecation.warn "\"Rails.root/test/mocks/#{Rails.env}\" won't be added " << "automatically to load paths anymore in future releases" - paths.mocks_path "test/mocks", :load_path => true, :glob => Rails.env + paths.mocks_path "test/mocks", :autoload => true, :glob => Rails.env end paths |