aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryuuji.yaginuma <yuuji.yaginuma@gmail.com>2016-11-19 15:08:16 +0900
committeryuuji.yaginuma <yuuji.yaginuma@gmail.com>2016-11-19 16:18:21 +0900
commitf5e738b6042334801bfa01b4ce0d945539aa47e8 (patch)
tree6c7e2a4ce151c1b6002d7b1c012b7955c804c8fe
parentff2fe014d916a2f7c4330ca7208a857bd0ef8992 (diff)
downloadrails-f5e738b6042334801bfa01b4ce0d945539aa47e8.tar.gz
rails-f5e738b6042334801bfa01b4ce0d945539aa47e8.tar.bz2
rails-f5e738b6042334801bfa01b4ce0d945539aa47e8.zip
move CHANGELOG entry to the appropriate file [ci skip]
Follow up to #27098
-rw-r--r--actionpack/CHANGELOG.md6
-rw-r--r--railties/CHANGELOG.md6
2 files changed, 6 insertions, 6 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 8de47fe9e1..0c8625ae08 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,3 +1,9 @@
+* Reset a new session directly after its creation in ActionDispatch::IntegrationTest#open_session.
+
+ Fixes #22742.
+
+ *Tawan Sierek*
+
* Fixes incorrect output from rails routes when using singular resources.
Fixes #26606.
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 049a06db3a..7db7e2e34d 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,9 +1,3 @@
-* Reset a new session directly after its creation in ActionDispatch::IntegrationTest#open_session
-
- Fixes Issue #22742
-
- *Tawan Sierek*
-
* Add `:skip_sprockets` to `Rails::PluginBuilder::PASSTHROUGH_OPTIONS`
*Tsukuru Tanimichi*