diff options
| author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2016-11-19 09:03:15 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-19 09:03:15 -0500 |
| commit | 4aacace550155faab98710c045f912db80601004 (patch) | |
| tree | fe0e762ce3506899345a0b95b7fc9fff85495c27 | |
| parent | f9230a2d424b177257056be9b9247cbe25caa101 (diff) | |
| parent | f5e738b6042334801bfa01b4ce0d945539aa47e8 (diff) | |
| download | rails-4aacace550155faab98710c045f912db80601004.tar.gz rails-4aacace550155faab98710c045f912db80601004.tar.bz2 rails-4aacace550155faab98710c045f912db80601004.zip | |
Merge pull request #27103 from y-yagi/move_changelog_entry_to_appropriate_file
move CHANGELOG entry to the appropriate file [ci skip]
| -rw-r--r-- | actionpack/CHANGELOG.md | 6 | ||||
| -rw-r--r-- | 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* |