diff options
author | José Valim <jose.valim@gmail.com> | 2011-04-15 19:57:52 +0200 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-04-15 19:57:52 +0200 |
commit | afc828828ffffe7edeb4648a9d2aa4731191ae21 (patch) | |
tree | 8c85af7b1c0fa7fe1612d18f6d4573494f1d783b /railties/lib/rails/application/configuration.rb | |
parent | d84b2f37d018621aea99bfe30611ab75a02a291a (diff) | |
download | rails-afc828828ffffe7edeb4648a9d2aa4731191ae21.tar.gz rails-afc828828ffffe7edeb4648a9d2aa4731191ae21.tar.bz2 rails-afc828828ffffe7edeb4648a9d2aa4731191ae21.zip |
Remove the ability for engines to serve assets from the public directory.
Diffstat (limited to 'railties/lib/rails/application/configuration.rb')
-rw-r--r-- | railties/lib/rails/application/configuration.rb | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index 4a042e0033..e5476fbe7a 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -4,13 +4,12 @@ require 'rails/engine/configuration' module Rails class Application class Configuration < ::Rails::Engine::Configuration - attr_accessor :allow_concurrency, :asset_host, :cache_classes, :cache_store, - :encoding, :consider_all_requests_local, :dependency_loading, - :filter_parameters, :helpers_paths, :logger, - :preload_frameworks, :reload_plugins, - :secret_token, :serve_static_assets, :session_options, - :time_zone, :whiny_nils, :force_ssl, - :assets + attr_accessor :allow_concurrency, :asset_host, :asset_path, :assets, + :cache_classes, :cache_store, :consider_all_requests_local, + :dependency_loading, :encoding, :filter_parameters, + :force_ssl, :helpers_paths, :logger, :preload_frameworks, + :reload_plugins, :secret_token, :serve_static_assets, + :session_options, :time_zone, :whiny_nils attr_writer :log_level @@ -63,6 +62,9 @@ module Rails paths.add "config/environment", :with => "config/environment.rb" paths.add "lib/templates" paths.add "log", :with => "log/#{Rails.env}.log" + paths.add "public" + paths.add "public/javascripts" + paths.add "public/stylesheets" paths.add "tmp" paths.add "tmp/cache" paths |