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

MFA UI Changes (v3) #14145

Merged
merged 27 commits into from
Feb 17, 2022
Merged

MFA UI Changes (v3) #14145

merged 27 commits into from
Feb 17, 2022

Conversation

zofskeez
Copy link
Contributor

@zofskeez zofskeez commented Feb 17, 2022

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

Copy link
Contributor

@cipherboy cipherboy left a 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).

@zofskeez
Copy link
Contributor Author

Thanks for the eyes on this @cipherboy and @Monkeychip!

@zofskeez zofskeez merged commit 712cc9e into main Feb 17, 2022
@zofskeez zofskeez deleted the ui/mfa-3 branch February 17, 2022 22:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants