Bundle drift detection and correction #2101
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Gemfile.saas evals Gemfile, so shared gems should have identical versions in both lockfiles. This adds bin/bundle-drift to detect and fix drift: * `bin/bundle-drift check` compares shared gem versions * `bin/bundle-drift correct` seeds Gemfile.lock from Gemfile.saas.lock and re-locks, letting Bundler prune SaaS-only gems while preserving shared versions Adds drift check to bin/ci and GitHub CI. Corrects existing drift.
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
olivaresf
added a commit
that referenced
this pull request
Dec 12, 2025
* origin/main: (67 commits) Wrap join code redemption in a lock Remove redundant include Replace custom code generator with Base32 Test that you can't go to the magic link screen without an email Bundle drift detection and correction (#2101) Refactor: Use Rails range syntax in ActivitySpike query (#2080) Fix indentation in multi_db.rb initializer (#2082) Fix typo in translate property in card columns CSS (#2090) Refactor: use idiomatic .last instead of .order(:desc).first (#2098) bin/bundle-both (#2100) API: Allow updates to `last_active_at` (#2076) Move email address into hint line Bump fizzy-saas to pickup another staging change. Remove the rails credentials from .gitattributes Fix typo: minues → minutes Fix duplicate word: use use → use Add QrCodesController test Fix typo in _entropy.html.erb Show the email address you are signing in with Prohibit access to magic links unless an email address ... # Conflicts: # app/controllers/sessions/magic_links_controller.rb # app/controllers/sessions_controller.rb
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Gemfile.saas evals Gemfile, so shared gems should have identical versions in both lockfiles. This adds bin/bundle-drift to detect and fix drift:
bin/bundle-drift checkcompares shared gem versionsbin/bundle-drift correctseeds Gemfile.lock from Gemfile.saas.lock and re-locks, letting Bundler prune SaaS-only gems while preserving shared versionsAdds drift check to bin/ci and GitHub CI. Corrects existing drift.