aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application.rb
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2010-08-04 22:22:06 +0200
committerPiotr Sarnacki <drogus@gmail.com>2010-09-03 22:59:12 +0200
commit8284fd38551c00c30cf89fa22d1afd503a08c516 (patch)
tree71a7ecc2879c088578bfe5d16072e1eb4eacfa00 /railties/lib/rails/application.rb
parentd81267727770198f4aa0cefede042c8d0c638c59 (diff)
downloadrails-8284fd38551c00c30cf89fa22d1afd503a08c516.tar.gz
rails-8284fd38551c00c30cf89fa22d1afd503a08c516.tar.bz2
rails-8284fd38551c00c30cf89fa22d1afd503a08c516.zip
Get rid of static_paths method and instead configure paths for ActionDispatch::Static in initializers
Diffstat (limited to 'railties/lib/rails/application.rb')
-rw-r--r--railties/lib/rails/application.rb18
1 files changed, 1 insertions, 17 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index c403863007..8631a5df3e 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -145,25 +145,9 @@ module Rails
protected
- def static_paths
- @static_paths ||= begin
- static_paths = ActiveSupport::OrderedHash.new
- static_paths["/"] = paths.public.to_a.first
-
- railties.all do |railtie|
- if railtie.config.respond_to?(:asset_path) && railtie.config.asset_path
- public_path = railtie.config.paths.public.to_a.first
- static_paths[railtie.config.asset_path % ""] = public_path if File.exists?(public_path)
- end
- end
-
- static_paths
- end
- end
-
def default_middleware_stack
ActionDispatch::MiddlewareStack.new.tap do |middleware|
- middleware.use ::ActionDispatch::Static, static_paths if config.serve_static_assets
+ middleware.use ::ActionDispatch::Static, config.static_asset_paths if config.serve_static_assets
middleware.use ::Rack::Lock if !config.allow_concurrency
middleware.use ::Rack::Runtime
middleware.use ::Rails::Rack::Logger