aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/middleware
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2016-06-19 21:44:23 -0400
committerRafael Mendonça França <rafaelmfranca@gmail.com>2016-10-10 01:35:59 -0300
commita3ff9db69c79e559122c55791dda1e89e6c8d8f4 (patch)
treed37b546a26f25796962f747612d0d4e86ad4d453 /actionpack/lib/action_dispatch/middleware
parent1b975e6a696655f476b10a4567b537cc92077563 (diff)
downloadrails-a3ff9db69c79e559122c55791dda1e89e6c8d8f4.tar.gz
rails-a3ff9db69c79e559122c55791dda1e89e6c8d8f4.tar.bz2
rails-a3ff9db69c79e559122c55791dda1e89e6c8d8f4.zip
Remove deprecated `cache_control` argument from `ActionDispatch::Static#initialize`
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware')
-rw-r--r--actionpack/lib/action_dispatch/middleware/static.rb9
1 files changed, 1 insertions, 8 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/static.rb b/actionpack/lib/action_dispatch/middleware/static.rb
index fbf2a5fd0b..5c71f0fc48 100644
--- a/actionpack/lib/action_dispatch/middleware/static.rb
+++ b/actionpack/lib/action_dispatch/middleware/static.rb
@@ -106,14 +106,7 @@ module ActionDispatch
# produce a directory traversal using this middleware. Only 'GET' and 'HEAD'
# requests will result in a file being returned.
class Static
- def initialize(app, path, deprecated_cache_control = :not_set, index: "index", headers: {})
- if deprecated_cache_control != :not_set
- ActiveSupport::Deprecation.warn("The `cache_control` argument is deprecated," \
- "replaced by `headers: { 'Cache-Control' => #{deprecated_cache_control} }`, " \
- " and will be removed in Rails 5.1.")
- headers["Cache-Control".freeze] = deprecated_cache_control
- end
-
+ def initialize(app, path, index: "index", headers: {})
@app = app
@file_handler = FileHandler.new(path, index: index, headers: headers)
end