Skip to content

Commit c861dec

Browse files
committed
Remove deprecated config.static_cache_control
1 parent eeac615 commit c861dec

4 files changed

Lines changed: 6 additions & 24 deletions

File tree

railties/CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
* The `log:clear` task clear all environments log files by default.
1+
* Remove deprecated `config.static_cache_control`.
2+
3+
*Rafael Mendonça França*
4+
5+
* The `log:clear` task clear all environments log files by default.
26

37
*Yuji Yaginuma*
48

railties/lib/rails/application/configuration.rb

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class Configuration < ::Rails::Engine::Configuration
1919
:beginning_of_week, :filter_redirect, :x, :enable_dependency_loading
2020

2121
attr_writer :log_level
22-
attr_reader :encoding, :api_only, :static_cache_control
22+
attr_reader :encoding, :api_only
2323

2424
def initialize(*)
2525
super
@@ -56,17 +56,6 @@ def initialize(*)
5656
@enable_dependency_loading = false
5757
end
5858

59-
def static_cache_control=(value)
60-
ActiveSupport::Deprecation.warn <<-eow.strip_heredoc
61-
`config.static_cache_control` is deprecated and will be removed in Rails 5.1.
62-
Please use
63-
`config.public_file_server.headers = { 'Cache-Control' => '#{value}' }`
64-
instead.
65-
eow
66-
67-
@static_cache_control = value
68-
end
69-
7059
def serve_static_files
7160
ActiveSupport::Deprecation.warn <<-eow.strip_heredoc
7261
`config.serve_static_files` is deprecated and will be removed in Rails 5.1.

railties/lib/rails/application/default_middleware_stack.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ def build_stack
1919

2020
if config.public_file_server.enabled
2121
headers = config.public_file_server.headers || {}
22-
headers["Cache-Control".freeze] = config.static_cache_control if config.static_cache_control
2322

2423
middleware.use ::ActionDispatch::Static, paths["public"].first, index: config.public_file_server.index_name, headers: headers
2524
end

railties/test/application/configuration_test.rb

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -379,16 +379,6 @@ def assert_utf8
379379
end
380380
end
381381

382-
test "config.static_cache_control is deprecated" do
383-
make_basic_app do |application|
384-
assert_deprecated do
385-
application.config.static_cache_control = "public, max-age=60"
386-
end
387-
388-
assert_equal application.config.static_cache_control, "public, max-age=60"
389-
end
390-
end
391-
392382
test "Use key_generator when secret_key_base is set" do
393383
make_basic_app do |application|
394384
application.secrets.secret_key_base = "b3c631c314c0bbca50c1b2843150fe33"

0 commit comments

Comments
 (0)