diff options
author | Piotr Sarnacki <drogus@gmail.com> | 2010-06-23 16:10:26 +0200 |
---|---|---|
committer | Piotr Sarnacki <drogus@gmail.com> | 2010-09-03 22:59:03 +0200 |
commit | c787bfdf932450c5fd4c0df805454aa40a388117 (patch) | |
tree | 624f3b8acc1cbd499f6210a184aa8dfc62015dbd /railties/lib/rails/application/configuration.rb | |
parent | ad6be0876271f86e76c89645a0106b85c9d77ad7 (diff) | |
download | rails-c787bfdf932450c5fd4c0df805454aa40a388117.tar.gz rails-c787bfdf932450c5fd4c0df805454aa40a388117.tar.bz2 rails-c787bfdf932450c5fd4c0df805454aa40a388117.zip |
Engine can now load its own plugins
Diffstat (limited to 'railties/lib/rails/application/configuration.rb')
-rw-r--r-- | railties/lib/rails/application/configuration.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index a28fc62ccd..a20208f8d5 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, - :plugins, :preload_frameworks, :reload_plugins, + :preload_frameworks, :reload_plugins, :secret_token, :serve_static_assets, :session_options, :time_zone, :whiny_nils @@ -53,8 +53,6 @@ module Rails paths.log "log/#{Rails.env}.log" paths.tmp "tmp" paths.tmp.cache "tmp/cache" - paths.vendor "vendor", :load_path => true - paths.vendor.plugins "vendor/plugins" if File.exists?("#{root}/test/mocks/#{Rails.env}") ActiveSupport::Deprecation.warn "\"Rails.root/test/mocks/#{Rails.env}\" won't be added " << |