From cfb7c16ac42e2a076c2de2ed35506938e524a439 Mon Sep 17 00:00:00 2001 From: Ryuta Kamizono Date: Sun, 7 Jun 2020 12:58:22 +0900 Subject: [PATCH] Fixup CHANGELOGs [ci skip] --- actionpack/CHANGELOG.md | 2 +- actionview/CHANGELOG.md | 5 +++-- activerecord/CHANGELOG.md | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 095c51cf08..b9e9efc06e 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -7,7 +7,7 @@ we check for public/some.js.br and serve that file, if present, with `Content-Encoding: br` and `Vary: Accept-Encoding` headers. - *Ryan Edward Hall, Jeremy Daer* + *Ryan Edward Hall*, *Jeremy Daer* * Add raise_on_missing_translations support for controllers. diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md index 50b9e5be44..9f230629b3 100644 --- a/actionview/CHANGELOG.md +++ b/actionview/CHANGELOG.md @@ -3,7 +3,7 @@ virtual_path keyword arguments found in CacheHelper as they no longer possess any function following 1581cab. - Fixes #38984 + Fixes #38984. *Aaron Lipman* @@ -15,7 +15,8 @@ *fatkodima* -* Instrument layout rendering in `TemplateRenderer#render_with_layout` as `render_layout.action_view`, and include (when necessary) the layout's virtual path in notification payloads for collection and partial renders. +* Instrument layout rendering in `TemplateRenderer#render_with_layout` as `render_layout.action_view`, + and include (when necessary) the layout's virtual path in notification payloads for collection and partial renders. *Zach Kemp* diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 41e05f47d5..1234bb9a15 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -2,7 +2,7 @@ ```ruby david_and_mary = Author.where(id: [david, mary]) - mary_and_bob = Author.where(id: [mary, bob]) # => [bob] + mary_and_bob = Author.where(id: [mary, bob]) david_and_mary.merge(mary_and_bob) # => [mary, bob]