diff options
| -rw-r--r-- | activerecord/CHANGELOG.md | 10 | ||||
| -rw-r--r-- | railties/CHANGELOG.md | 6 |
2 files changed, 13 insertions, 3 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index e74ed62888..e679d4f781 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,7 +1,13 @@ ## unreleased ## -* Require ActiveRecord::Base in railtie hooks for rake_tasks, console and runner to - avoid circular constant loading issues. [Backport #7695] [Fixes #7683 and #882] *Ben Holley* +* Require `ActiveRecord::Base` in railtie hooks for rake_tasks, console and runner to + avoid circular constant loading issues. + + Backport #7695. + + Fixes #7683 and #882 + + *Ben Holley* * Maintain context for joins within ActiveRecord::Relation merges. Backport #10164. diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index a9d3200e07..4bb2ec4618 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,6 +1,10 @@ ## unreleased ## -* Add support for runner hook. [Backport: #7695] *Ben Holley* +* Add support for runner hook. + + Backport #7695. + + *Ben Holley* * Fixes bug with scaffold generator with `--assets=false --resource-route=false`. Fixes #9525. |