aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-06-11 12:09:32 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-06-11 12:09:32 -0300
commitb560f8774a57e9f0c97cc369ccd7491463f0d663 (patch)
treebaaba4640b5215cf3dca358698638bc2dbd26dbd /railties/lib/rails/application
parent75761c17380f9129e08dd04954ae162c5cdcea6e (diff)
parenta888c3cdc9b0280783861b4687409db619669ab2 (diff)
downloadrails-b560f8774a57e9f0c97cc369ccd7491463f0d663.tar.gz
rails-b560f8774a57e9f0c97cc369ccd7491463f0d663.tar.bz2
rails-b560f8774a57e9f0c97cc369ccd7491463f0d663.zip
Merge pull request #20520 from yuki24/use-a-kwarg-for-static-index
Change the `index` arg of `ActionDispatch::Static#new` to a kwarg
Diffstat (limited to 'railties/lib/rails/application')
-rw-r--r--railties/lib/rails/application/default_middleware_stack.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/application/default_middleware_stack.rb b/railties/lib/rails/application/default_middleware_stack.rb
index 503977b395..909ed5cc35 100644
--- a/railties/lib/rails/application/default_middleware_stack.rb
+++ b/railties/lib/rails/application/default_middleware_stack.rb
@@ -18,7 +18,7 @@ module Rails
middleware.use ::Rack::Sendfile, config.action_dispatch.x_sendfile_header
if config.serve_static_files
- middleware.use ::ActionDispatch::Static, paths["public"].first, config.static_cache_control, config.static_index
+ middleware.use ::ActionDispatch::Static, paths["public"].first, config.static_cache_control, index: config.static_index
end
if rack_cache = load_rack_cache