-
Notifications
You must be signed in to change notification settings - Fork 4.3k
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
MFA UI Changes (v3) #14145
Merged
MFA UI Changes (v3) #14145
+1,070
−164
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
…or various mfa scenarios
Monkeychip
approved these changes
Feb 17, 2022
cipherboy
approved these changes
Feb 17, 2022
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I manually rebased the original faulty PR (#14049) on top of:
commit 9d3dbf875f11c1b312006e499cd0baf47ef1196f (upstream/main, origin/main, origin/HEAD, main)
and ended up with results very similar to the head of this PR right now (as compared with meld
).
Thanks for the eyes on this @cipherboy and @Monkeychip! |
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.
Previous attempts:
#14049 which mistakenly had a merge reverted and had to be reverted from main
#14135 attempt 2 pulled in the commit history but not the files