aboutsummaryrefslogtreecommitdiffstats
path: root/railties/CHANGELOG.md
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-08-06 17:34:41 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-08-06 17:34:41 -0300
commit7c23c38b3317da7dee166ddaa5e492aa1d7b5759 (patch)
treee3d5caa379e9ce92a5719e315da9babcc85e0c77 /railties/CHANGELOG.md
parentce1bd47698d63119d8a922620d1ae1c30c9ba2db (diff)
parent38f28f77049e7160491b71167471a2175253b742 (diff)
downloadrails-7c23c38b3317da7dee166ddaa5e492aa1d7b5759.tar.gz
rails-7c23c38b3317da7dee166ddaa5e492aa1d7b5759.tar.bz2
rails-7c23c38b3317da7dee166ddaa5e492aa1d7b5759.zip
Merge pull request #21022
Fix STATS_DIRECTORIES warning by only loading statistics.rake once
Diffstat (limited to 'railties/CHANGELOG.md')
-rw-r--r--railties/CHANGELOG.md9
1 files changed, 8 insertions, 1 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 642fd90ae1..734fe8bc7a 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,4 +1,11 @@
-* Make enabling or disabling caching in development mode possible with
+* Fix STATS_DIRECTORIES already defined warning when running rake from within
+ the top level directory of an engine that has a test app.
+
+ Fixes #20510
+
+ *Ersin Akinci*
+
+* Make enabling or disabling caching in development mode possible with
rake dev:cache.
Running rake dev:cache will create or remove tmp/caching-dev.txt. When this