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

Reduce diff between 'v1' and 'main' #108

Merged
merged 2 commits into from
Mar 13, 2024
Merged

Reduce diff between 'v1' and 'main' #108

merged 2 commits into from
Mar 13, 2024

Conversation

pond
Copy link
Member

@pond pond commented Mar 13, 2024

It is just about reasonable to continue to maintain a v1 (Rails 6) vs main (Rails 7) branch despite the biggest difference previously, the need for config.to_prepare, having been removed by Rails 6 introducing that mid-cycle.

This simple PR arises from a diff review between the two branches to minimise unnecessary changes, prior to working a little on the growing backlog of issues and PRs from contributors, which always require the tedious back-porting to v1.

@pond pond added the maintenance Dependency updates and general code quality label Mar 13, 2024
@pond pond changed the base branch from main to v1 March 13, 2024 21:27
@pond pond merged commit 1d18cf8 into v1 Mar 13, 2024
5 checks passed
@pond pond deleted the feature/v1-sync-main branch March 13, 2024 21:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
maintenance Dependency updates and general code quality
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant