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.

Sign up for GitHub

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

Jump to bottom

Update to be Rails 6.1 compatible #29

Merged
merged 16 commits into from
Jan 9, 2024
Merged

Update to be Rails 6.1 compatible #29

merged 16 commits into from
Jan 9, 2024

Conversation

amy-hs
Copy link
Contributor

@amy-hs amy-hs commented Jan 8, 2024 •
edited
Loading

Changes include:

  • Adding Rails 6.1 compatibility
    • Including refactoring of the config.rb file
  • Updating Ruby version to 2.7.8
  • Updating the Ruby matrix since we have dropped support for Ruby 2.4 and 2.5
  • Version bump to 1.4.0

Co-authors: @amy-hs @davkutalek

@amy-hs amy-hs marked this pull request as ready for review January 8, 2024 20:38
soupmatt
soupmatt suggested changes Jan 8, 2024
View reviewed changes
Copy link

@soupmatt soupmatt left a comment

Choose a reason for hiding this comment

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

I'm unsure about the merging of the knockoff_replicas config values. See my comments in the diff.

lib/knockoff/config.rb Outdated Show resolved Hide resolved
amy-hs and others added 15 commits January 8, 2024 16:22
@amy-hs
Fix update_replica_configs method to merge correctly
795648f
Fix: call merge after symbolizing keys
1d72cac
specifically get the config hash before manipulating it
b07c507
refactor config to use newer (rails 6+) APIs and make it clearer what…
b570b00 
… is happening
typo fix
e289218
Use config copy when updating because original is frozen
68a59db
Fix update_replica_config for rails 6
9b0836f
make glabal variable replica hash items editable
b5cf6b2
try again
8029456
Another attempt for a new error
d307115
Make it more like it was before
1cb0770
Update the way that the stored configs are updated
45eb7d9
Revert "specifically get the config hash before manipulating it"
8c0a370 
This reverts commit b07c507.
@davkutalek
Merge branch 'amy/major-version-bump' into davkutalek/config-refactor
adc0070
@amy-hs
Update range for Rails versions
7ee90f2
@amy-hs amy-hs requested review from davkutalek and soupmatt January 9, 2024 19:44
soupmatt
soupmatt approved these changes Jan 9, 2024
View reviewed changes
Copy link

@soupmatt soupmatt left a comment

Choose a reason for hiding this comment

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

LGTM

@amy-hs amy-hs merged commit ebef5de into main Jan 9, 2024
4 checks passed
@amy-hs amy-hs deleted the amy/major-version-bump branch January 9, 2024 22:16
@amy-hs amy-hs mentioned this pull request Jan 9, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mctalian Mctalian Mctalian approved these changes

@soupmatt soupmatt soupmatt approved these changes

@seanmsmith23 seanmsmith23 Awaiting requested review from seanmsmith23

@davkutalek davkutalek Awaiting requested review from davkutalek

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@amy-hs @soupmatt @davkutalek @seanmsmith23 @Mctalian