Skip to content

ruby upgrade and deep merge fix#138

Merged
harshaellanki merged 4 commits into
trunkfrom
ruby_3.4.7_upgrade
May 6, 2026
Merged

ruby upgrade and deep merge fix#138
harshaellanki merged 4 commits into
trunkfrom
ruby_3.4.7_upgrade

Conversation

@harshaellanki
Copy link
Copy Markdown
Contributor

@harshaellanki harshaellanki commented Mar 2, 2026 •
edited
Loading

https://app.clickup.com/t/868jhfa3c

Support Ruby 3.4.7 and update to deep_merge conflict

@polographer
Copy link
Copy Markdown

polographer commented Mar 23, 2026

do we need to scope this for apps running in rails < 7.1 ? like we did on aca_entities ?

mdkaraman
mdkaraman reviewed Apr 15, 2026
View reviewed changes
Copy link
Copy Markdown

@mdkaraman mdkaraman left a comment

Choose a reason for hiding this comment

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

Left a couple of questions to address.

Comment thread .github/workflows/rspec.yml Outdated
Comment thread .github/workflows/rspec.yml Outdated
Comment thread lib/event_source/protocols/http/faraday_queue_proxy.rb Outdated
@harshaellanki harshaellanki requested a review from mdkaraman April 15, 2026 21:02
polographer
polographer previously approved these changes May 6, 2026
View reviewed changes
@mdkaraman mdkaraman added dependencies Pull requests that update a dependency file and removed version bump labels May 6, 2026
@harshaellanki
Copy link
Copy Markdown
Contributor Author

harshaellanki commented May 6, 2026

@copilot add dependencies to the any_of list in .github/workflows/label-checker.yml

@harshaellanki
Fix Rails version check to 7.1+ and add dependencies label to label-c…
1ecd745 
…hecker

Agent-Logs-Url: https://github.com/ideacrew/event_source/sessions/7bc1ea89-0020-4f6d-9fa0-4f7fef871843

Co-authored-by: harshaellanki <20180210+harshaellanki@users.noreply.github.com>
Copy link
Copy Markdown
Contributor

Copilot AI commented May 6, 2026 •
edited
Loading

do we need to scope this for apps running in rails < 7.1 ? like we did on aca_entities ?

Yes, the version check was incorrect — it was checking MAJOR >= 7 which would include Rails 7.0.x where deeper_merge! from deep_merge/rails_compat isn't needed. Fixed in commit 1ecd745 to properly scope for Rails 7.1+ using Rails.gem_version >= Gem::Version.new('7.1.0'), so apps on Rails < 7.1 will continue to use deep_merge!.

@copilot add dependencies to the any_of list in .github/workflows/label-checker.yml

Done in commit 1ecd745 — added dependencies to the any_of list in .github/workflows/label-checker.yml.

@harshaellanki harshaellanki requested a review from polographer May 6, 2026 15:23
@mdkaraman mdkaraman enabled auto-merge (squash) May 6, 2026 15:25
mdkaraman
mdkaraman approved these changes May 6, 2026
View reviewed changes
Copy link
Copy Markdown

@mdkaraman mdkaraman left a comment

Choose a reason for hiding this comment

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

Looks good!

@mdkaraman mdkaraman disabled auto-merge May 6, 2026 15:25
@harshaellanki harshaellanki merged commit 4cc1fde into trunk May 6, 2026
19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@polographer polographer polographer approved these changes

@mdkaraman mdkaraman mdkaraman approved these changes

Assignees

No one assigned

Labels

dependencies Pull requests that update a dependency file

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@harshaellanki @polographer @mdkaraman