aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/CHANGELOG.md
diff options
context:
space:
mode:
authorAndrew White <andyw@pixeltrix.co.uk>2012-12-06 17:06:59 +0000
committerAndrew White <andyw@pixeltrix.co.uk>2012-12-06 17:20:53 +0000
commitc59734f756b79c39486c45273d2cc5d42cd0c864 (patch)
tree3fc32497850a341872b896c09a0c065f218b18d8 /actionpack/CHANGELOG.md
parent5a8f25f003f022ebc6986b20b0c10329e9553dc3 (diff)
downloadrails-c59734f756b79c39486c45273d2cc5d42cd0c864.tar.gz
rails-c59734f756b79c39486c45273d2cc5d42cd0c864.tar.bz2
rails-c59734f756b79c39486c45273d2cc5d42cd0c864.zip
Invert precedence of content in ActionDispatch::Static
This commit inverts the precedence in ActionDispatch::Static so that dynamic content will be served before static content. This is so that precompiled assets do not inadvertently get included when running in development mode - it should have no effect in production where static files are usually handled by the web server. Closes #6421
Diffstat (limited to 'actionpack/CHANGELOG.md')
-rw-r--r--actionpack/CHANGELOG.md7
1 files changed, 7 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index b57408ede3..43880f2412 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,4 +1,11 @@
## Rails 4.0.0 (unreleased) ##
+
+* Invert precedence in `ActionDispatch::Static` so that dynamic content is preferred.
+ This prevents precompiled assets inadvertently being included twice when running
+ in development mode. Fixes #6421
+
+ *Andrew White*
+
* Add :if / :unless conditions to fragment cache:
<%= cache @model, if: some_condition(@model) do %>