mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Fixup CHANGELOGs [ci skip]
This commit is contained in:
parent
40877d823d
commit
cfb7c16ac4
3 changed files with 5 additions and 4 deletions
|
@ -7,7 +7,7 @@
|
||||||
we check for public/some.js.br and serve that file, if present, with
|
we check for public/some.js.br and serve that file, if present, with
|
||||||
`Content-Encoding: br` and `Vary: Accept-Encoding` headers.
|
`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.
|
* Add raise_on_missing_translations support for controllers.
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
virtual_path keyword arguments found in CacheHelper as they no longer possess
|
virtual_path keyword arguments found in CacheHelper as they no longer possess
|
||||||
any function following 1581cab.
|
any function following 1581cab.
|
||||||
|
|
||||||
Fixes #38984
|
Fixes #38984.
|
||||||
|
|
||||||
*Aaron Lipman*
|
*Aaron Lipman*
|
||||||
|
|
||||||
|
@ -15,7 +15,8 @@
|
||||||
|
|
||||||
*fatkodima*
|
*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*
|
*Zach Kemp*
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
```ruby
|
```ruby
|
||||||
david_and_mary = Author.where(id: [david, mary])
|
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]
|
david_and_mary.merge(mary_and_bob) # => [mary, bob]
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue