aboutsummaryrefslogtreecommitdiffstats
path: root/railties/CHANGELOG.md
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2015-11-16 14:40:38 +0100
committerKasper Timm Hansen <kaspth@gmail.com>2015-11-16 14:40:38 +0100
commit0ebb0f61c3c66df517c1277265f337a09928da86 (patch)
tree6e929ad8ccf82e65e650e3cf60cd5dca3052b2ed /railties/CHANGELOG.md
parent9dcf330946a8bef0a0e2fb6e6d1bb92eae62a1da (diff)
parentce83dc98bb042b71c19bec600c2f3885efa33adf (diff)
downloadrails-0ebb0f61c3c66df517c1277265f337a09928da86.tar.gz
rails-0ebb0f61c3c66df517c1277265f337a09928da86.tar.bz2
rails-0ebb0f61c3c66df517c1277265f337a09928da86.zip
Merge pull request #22298 from yuki24/make-static-index-part-of-public-file-server-config
Make the `config.static_index` option part of the `config.public_server` option
Diffstat (limited to 'railties/CHANGELOG.md')
-rw-r--r--railties/CHANGELOG.md5
1 files changed, 5 insertions, 0 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 2fedeac292..aa12708669 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,8 @@
+* Make `static_index` part of the `config.public_file_server` config and
+ call it `public_file_server.index_name`.
+
+ *Yuki Nishijima*
+
* Generated `Gemfile`s for new applications include a new dependency on
[listen](https://github.com/guard/listen) commented out.