Update attr_encrypted & devise-two-factor gems
#24626
Merged
Conversation
This file contains 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
Bumps these gems to versions which work with and allow Rails 7. The attr_encrypted change was to rename an internally used method which conflicted with a method which now exists in Rails 7. The devise-two-factor change was to rename it's own usage of that same method. The renamed method (`encrypted_attributes`) is not used directly by Mastodon.
Gargron
approved these changes
Apr 24, 2023
michealmikeyb
pushed a commit
to michealmikeyb/mastodon
that referenced
this pull request
May 3, 2023
skerit
pushed a commit
to 11ways/mastodon
that referenced
this pull request
Jul 7, 2023
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.
Bumps these gems to versions which work with and allow Rails 7.
The attr_encrypted change was to rename an internally used method which conflicted with a method which now exists in Rails 7. The devise-two-factor change was to rename it's own usage of that same method. The renamed method (
encrypted_attributes) is not used directly by Mastodon.(Extracted in advance from #24241)