diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-01-08 04:29:24 -0800 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-01-08 04:29:24 -0800 |
| commit | 295806e11945a6fa052438a5ff8ef82cb262b977 (patch) | |
| tree | 94cf26671b3c8127bef76652861ac9f7932989ae /actionpack | |
| parent | c67005f221f102fe2caca231027d9b11cf630484 (diff) | |
| parent | 9cc82b77196d21a5c7021f6dca59ab9b2b158a45 (diff) | |
| download | rails-295806e11945a6fa052438a5ff8ef82cb262b977.tar.gz rails-295806e11945a6fa052438a5ff8ef82cb262b977.tar.bz2 rails-295806e11945a6fa052438a5ff8ef82cb262b977.zip | |
Merge pull request #8812 from rubys/master
Eliminate Rack::File headers deprecation warning
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/static.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/static.rb b/actionpack/lib/action_dispatch/middleware/static.rb index e3b15b43b9..1c9512ad01 100644 --- a/actionpack/lib/action_dispatch/middleware/static.rb +++ b/actionpack/lib/action_dispatch/middleware/static.rb @@ -6,7 +6,7 @@ module ActionDispatch def initialize(root, cache_control) @root = root.chomp('/') @compiled_root = /^#{Regexp.escape(root)}/ - @file_server = ::Rack::File.new(@root, cache_control) + @file_server = ::Rack::File.new(@root, 'Cache-Control' => cache_control) end def match?(path) |