From f5e738b6042334801bfa01b4ce0d945539aa47e8 Mon Sep 17 00:00:00 2001 From: "yuuji.yaginuma" Date: Sat, 19 Nov 2016 15:08:16 +0900 Subject: [PATCH] move CHANGELOG entry to the appropriate file [ci skip] Follow up to #27098 --- actionpack/CHANGELOG.md | 6 ++++++ railties/CHANGELOG.md | 6 ------ 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*