Skip to content

Sync fork with upstream repo#2

Merged
WilsonMinFong merged 26 commits into
mainfrom
sync-fork-with-upstream
Jul 1, 2025
Merged

Sync fork with upstream repo#2
WilsonMinFong merged 26 commits into
mainfrom
sync-fork-with-upstream

Conversation

@WilsonMinFong

Copy link
Copy Markdown

I'm currently working on a bug fix to this library to avoid weird behavior called out in this comment. This PR just gets our fork synced with the main repo, so that we can work off of up-to-date library code. The changes that we had previously added to this fork for Ruby 3 and Rails 7 support were also made to the base repo, so all of the changes here are just changes that were merged to the main repo, but we never pulled into our fork.

For the bug fix I'm working on, I think if we agree on the approach internally, I can open a PR onto the main repo too, but we probably don't want to be blocked on someone external to review, merge, and release that bugfix. To avoid needing to wait on that, we can once again point to this fork instead.

rcugut and others added 26 commits January 6, 2022 13:13
handle ruby 3.x keyword arguments delegation
Updates CI to support Ruby 3+ and Rails v7
Updates push gem action with a valid ruby version
Write attribute with polymorphic integer type
Should still able to set other reflection successfully
Upgrade rails to 7.2.x version; clean up unsupported rails and ruby version

@ihollander ihollander left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:shipit: Good call dusting this branch off, let's get this up and running again!

@ihollander

Copy link
Copy Markdown

Leaving a comment to test Slack integration

@WilsonMinFong
WilsonMinFong merged commit 5e4df96 into main Jul 1, 2025
@WilsonMinFong
WilsonMinFong deleted the sync-fork-with-upstream branch July 1, 2025 15:07
@WilsonMinFong

Copy link
Copy Markdown
Author

For future reference, I shouldn't have squashed the commits on this "Sync fork" PR because that caused the commit history of this fork to not include the commit history from the upstream repo 🤦

arman-radicle added a commit that referenced this pull request Jul 23, 2026
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.

6 participants