From c861decd44198f8d7d774ee6a74194d1ac1a5a13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Tue, 3 Jan 2017 19:50:47 -0500
Subject: Remove deprecated `config.static_cache_control`

---
 railties/CHANGELOG.md                                      |  6 +++++-
 railties/lib/rails/application/configuration.rb            | 13 +------------
 railties/lib/rails/application/default_middleware_stack.rb |  1 -
 railties/test/application/configuration_test.rb            | 10 ----------
 4 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index d7d1a66863..f3b4bf6841 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,4 +1,8 @@
-*  The `log:clear` task clear all environments log files by default.
+*   Remove deprecated `config.static_cache_control`.
+
+    *Rafael Mendonça França*
+
+*   The `log:clear` task clear all environments log files by default.
 
     *Yuji Yaginuma*
 
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 810750ed35..53bf2789a2 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -19,7 +19,7 @@ module Rails
                     :beginning_of_week, :filter_redirect, :x, :enable_dependency_loading
 
       attr_writer :log_level
-      attr_reader :encoding, :api_only, :static_cache_control
+      attr_reader :encoding, :api_only
 
       def initialize(*)
         super
@@ -56,17 +56,6 @@ module Rails
         @enable_dependency_loading       = false
       end
 
-      def static_cache_control=(value)
-        ActiveSupport::Deprecation.warn <<-eow.strip_heredoc
-          `config.static_cache_control` is deprecated and will be removed in Rails 5.1.
-          Please use
-          `config.public_file_server.headers = { 'Cache-Control' => '#{value}' }`
-          instead.
-        eow
-
-        @static_cache_control = value
-      end
-
       def serve_static_files
         ActiveSupport::Deprecation.warn <<-eow.strip_heredoc
           `config.serve_static_files` is deprecated and will be removed in Rails 5.1.
diff --git a/railties/lib/rails/application/default_middleware_stack.rb b/railties/lib/rails/application/default_middleware_stack.rb
index d070aca2dd..8fe48feefb 100644
--- a/railties/lib/rails/application/default_middleware_stack.rb
+++ b/railties/lib/rails/application/default_middleware_stack.rb
@@ -19,7 +19,6 @@ module Rails
 
           if config.public_file_server.enabled
             headers = config.public_file_server.headers || {}
-            headers["Cache-Control".freeze] = config.static_cache_control if config.static_cache_control
 
             middleware.use ::ActionDispatch::Static, paths["public"].first, index: config.public_file_server.index_name, headers: headers
           end
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index 31c3b5cf52..c27f6d1d6a 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -379,16 +379,6 @@ module ApplicationTests
       end
     end
 
-    test "config.static_cache_control is deprecated" do
-      make_basic_app do |application|
-        assert_deprecated do
-          application.config.static_cache_control = "public, max-age=60"
-        end
-
-        assert_equal application.config.static_cache_control, "public, max-age=60"
-      end
-    end
-
     test "Use key_generator when secret_key_base is set" do
       make_basic_app do |application|
         application.secrets.secret_key_base = "b3c631c314c0bbca50c1b2843150fe33"
-- 
cgit v1.2.3