aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2015-11-04 22:13:34 +0100
committerKasper Timm Hansen <kaspth@gmail.com>2015-11-04 22:13:34 +0100
commit7b471dbf5bdab9579962e71bcf2e24e01bcc99ef (patch)
treef933469f29b5a1cb7681b8da1a903eb1fc4e59c3 /actionpack
parent110e49179c8ceb9d4abd6110feec1496a3eac1f0 (diff)
parenta3e05f7c819ae7a3c08240f64a76439412d144cf (diff)
downloadrails-7b471dbf5bdab9579962e71bcf2e24e01bcc99ef.tar.gz
rails-7b471dbf5bdab9579962e71bcf2e24e01bcc99ef.tar.bz2
rails-7b471dbf5bdab9579962e71bcf2e24e01bcc99ef.zip
Merge pull request #22173 from kaspth/enable-public-file-server
Add enabled flag to the public file server settings.
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/CHANGELOG.md5
1 files changed, 0 insertions, 5 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 4f95a9bab9..40f447ada7 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -17,11 +17,6 @@
*Agis Anastasopoulos*
-* Deprecate `config.static_cache_control` in favor of
- `config.public_file_server.headers`
-
- *Yuki Nishijima*
-
* Add the ability of returning arbitrary headers to ActionDispatch::Static
Now ActionDispatch::Static can accept HTTP headers so that developers