Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase over updated upstream (Rails 7.1 compatible) #3

Closed
wants to merge 31 commits into from

Conversation

oboxodo
Copy link
Member

@oboxodo oboxodo commented Jan 16, 2025

This PR rebases our fork over the latest released v3.0.1 official upsteam which is updated to support Rails 7.1. Our fork onl has 1 extra commit.

pokonski and others added 30 commits October 26, 2022 21:59
With the large range of supported versions it’s beneficial to see which
ones exactly do fail and why to avoid whack-a-mole debugging scenarios.
Maintaining old and unsupported combinations of Ruby + Rails has become
painful (e.g. due to Ruby’s OpenSSL dependency) so remove those but add
Rails 7.1 to the build matrix and fix specs.
e.g. due to flaky network conditions
…as we no longer support Rails ≤ 6.0.
This was a leftover from Rails ≤6.0 support.
Regression introduced in #5012e0d6. This change partially reverts the
change such that it works for Rails 6.1/7.0 and 7.1+.

In Rails 7.1+ the API for `.serialize` changed. At first using
`serialize :parameters, coder: YAML, type: Hash` seems to be backwards
compatible with Rails 6.1/7.0 when reading the documentation/code but
there’s a subtle difference: when the 2nd positional parameter
(denoting the target type) is not provided a default mechanism is used.
While the defaults will use `YAML` as the coder the serialization will
only occur if the column is not `NULL`. So, without an explicit type
parameter `nil`/`NULL` values are not converted to `Hash`. Thus, the
explicit type parameter acts as the fallback for the value itself.

Fixes public-activity#386 public-activity#384 public-activity#382
@oboxodo oboxodo force-pushed the rebase-over-updated-upstream branch from 014791d to 1f49035 Compare January 16, 2025 22:36
@oboxodo oboxodo changed the base branch from main to upstream-v3.0.1 January 16, 2025 22:40
@oboxodo oboxodo changed the title Rebase over updated upstream (Rails 7. compatible) Rebase over updated upstream (Rails 7.1 compatible) Jan 17, 2025
@oboxodo
Copy link
Member Author

oboxodo commented Jan 17, 2025

Closing this PR in favor of maintaining separate branches per upstream gem version.

Current branches are:

@oboxodo oboxodo closed this Jan 17, 2025
@oboxodo oboxodo deleted the rebase-over-updated-upstream branch January 17, 2025 22:17
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.

5 participants