From e2b21620e9711b5a9754a0cad8ee607887d56ea6 Mon Sep 17 00:00:00 2001
From: Robin Dupret <robin.dupret@gmail.com>
Date: Wed, 6 Jul 2016 14:38:48 +0200
Subject: [PATCH] Add a changelog entry for #25692 [ci skip]

---
 railties/CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 243f40a057..bb87a7018f 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,9 @@
+*   Add a public API to register new folders for `rake notes`:
+
+        config.annotations.register_directories('spec', 'features')
+
+    *John Meehan*
+
 *   Do not run `bundle install` when generating a new plugin.
 
     Since bundler 1.12.0, the gemspec is validated so the `bundle install`