Skip to content

20250610 merge main#2336

Merged
joelhawksley merged 4 commits into
v4from
20250610-merge-main
Jun 11, 2025
Merged

20250610 merge main#2336
joelhawksley merged 4 commits into
v4from
20250610-merge-main

Conversation

@joelhawksley
Copy link
Copy Markdown
Member

No description provided.

joelhawksley and others added 4 commits June 5, 2025 13:11
* Add test of number of allocations when rendering with with_collection

* Ensure one-time initializations are done before testing allocations

* Cache calculated collection parameter

* Cache collection_counter_parameter

* Cache collection_iteration_parameter

* Cache initialize_parameter_names

* Add expected number of allocations for all tested Ruby/Rails combinations

* Remove code handling obsolete Rails version
We've used ViewComponents on several client projects, and we'll use it on internal products for our team as well.
@rmacklin
Copy link
Copy Markdown
Collaborator

rmacklin commented Jun 10, 2025

The reason 4199293 and bac7a24 are appearing here even though they were already in #2334 is that that PR was squash-merged into v4, so those commits are technically (still) not part of the v4 history. I think you'll have to avoid squash-merging in order to not have those commits keep showing up in subsequent PRs that merge main into v4.

@joelhawksley joelhawksley merged commit 35da574 into v4 Jun 11, 2025
11 of 13 checks passed
@joelhawksley joelhawksley deleted the 20250610-merge-main branch June 11, 2025 15:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants