3 files changed, 4 insertions, 29 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index f3b4bf6841..4bf895d6ae 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Remove deprecated `config.serve_static_files`.
+
+    *Rafael Mendonça França*
+
 *   Remove deprecated `config.static_cache_control`.
 
     *Rafael Mendonça França*
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 53bf2789a2..59020333ba 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -4,7 +4,6 @@ require "rails/engine/configuration"
 require "rails/source_annotation_extractor"
 
 require "active_support/deprecation"
-require "active_support/core_ext/string/strip" # for strip_heredoc
 
 module Rails
   class Application
@@ -56,24 +55,6 @@ module Rails
         @enable_dependency_loading       = false
       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.
-          Please use `config.public_file_server.enabled` instead.
-        eow
-
-        @public_file_server.enabled
-      end
-
-      def serve_static_files=(value)
-        ActiveSupport::Deprecation.warn <<-eow.strip_heredoc
-          `config.serve_static_files` is deprecated and will be removed in Rails 5.1.
-          Please use `config.public_file_server.enabled = #{value}` instead.
-        eow
-
-        @public_file_server.enabled = value
-      end
-
       def encoding=(value)
         @encoding = value
         silence_warnings do
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index c27f6d1d6a..41b1a9fd4a 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -369,16 +369,6 @@ module ApplicationTests
       end
     end
 
-    test "config.serve_static_files is deprecated" do
-      make_basic_app do |application|
-        assert_deprecated do
-          application.config.serve_static_files = true
-        end
-
-        assert application.config.public_file_server.enabled
-      end
-    end
-
     test "Use key_generator when secret_key_base is set" do
       make_basic_app do |application|
         application.secrets.secret_key_base = "b3c631c314c0bbca50c1b2843150fe33"