From 748b2f9cb1ff05a8aab068e2fa802e9f12163e30 Mon Sep 17 00:00:00 2001
From: Kasper Timm Hansen <kaspth@gmail.com>
Date: Tue, 3 Nov 2015 23:02:00 +0100
Subject: Add enabled flag to the public file server.

As discussed in https://github.com/rails/rails/pull/19135#issuecomment-153385986.

Replaces `serve_static_files` to unify the static options under the `public_file_server` wing.

Deprecates `serve_static_files` accessors, but make them use the newer config internally.
---
 railties/CHANGELOG.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 85e71b6c5c..f1dec45f02 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,7 +1,26 @@
+*   Deprecate `serve_static_files` in favor of `public_file_server.enabled`.
+
+    Unifies the static asset options under `public_file_server`.
+
+    To upgrade, replace occurrences of:
+
+    ```
+    config.serve_static_files = # false or true
+    ```
+
+    in your environment files, with:
+
+    ```
+    config.public_file_server.enabled = # false or true
+    ```
+
+    *Kasper Timm Hansen*
+
 *   Route generator should be idempotent
     running generators several times no longer require you to cleanup routes.rb
 
     *Thiago Pinto*
+
 *   Allow passing an environment to `config_for`.
 
     *Simon Eskildsen*
-- 
cgit v1.2.3