Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

2FA Updates (redux) #7392

Merged
merged 9 commits into from
Jun 15, 2020
Merged

2FA Updates (redux) #7392

merged 9 commits into from
Jun 15, 2020

Conversation

jeff-matthews
Copy link
Contributor

@jeff-matthews jeff-matthews commented Jun 11, 2020

Purpose of this pull request

This pull request (PR) reverts changes intended for Magento 2.4.0 from the 2.3.x version of the Two Factor Authentication topic. These changes were originally introduced in #7262.

It also applies the second round of 2.4.0 changes for this topic that are included in #7389, which should be closed.

Affected DevDocs pages

Staging: #1940

whatsnew
Reverted changes to the 2.3.x version of the Two Factor Authentication topic and updated the 2.4.x version with the appropriate changes.

@jeff-matthews jeff-matthews requested a review from ccondra June 11, 2020 16:09
@jeff-matthews jeff-matthews added 2.3.x Magento 2.3 related changes 2.4.0 Major Update Significant original updates to existing content Internal Dev Differentiates work between community and Magento staff labels Jun 11, 2020
@jeff-matthews jeff-matthews mentioned this pull request Jun 11, 2020
Corrected endpoint variables
@ccondra
Copy link
Contributor

ccondra commented Jun 12, 2020

Updated the endpoint variables in the diagram -- see staging #1934

@ccondra
Copy link
Contributor

ccondra commented Jun 12, 2020

I see what's wrong!!! This PR is pointing to the 2.3 directory rather than 2.4. That explains why the content is wrong. I'll check with Jeff to fix it.

ccondra and others added 5 commits June 12, 2020 13:50
Misc. edits from Nathan's review.
Transferred Nathan's updates from the 2.3 topic to this one.
Moved headless and API content after the basic config instructions.
Reworked the sentence under "Install authenticator" for clarity.
@ccondra
Copy link
Contributor

ccondra commented Jun 15, 2020

I transferred Nathan's review edits from the 2.4 version of this topic to 2.4.

@ccondra ccondra requested a review from nathanjosiah June 15, 2020 16:43
@jeff-matthews
Copy link
Contributor Author

jeff-matthews commented Jun 15, 2020

Thanks @ccondra.

@nathanjosiah, if there's nothing else, we'd like to get this merged.

I need approvals from both you and @ccondra.

@jeff-matthews jeff-matthews requested a review from ccondra June 15, 2020 17:56
@jeff-matthews
Copy link
Contributor Author

Thanks @nathanjosiah!

@jeff-matthews
Copy link
Contributor Author

running tests

@jeff-matthews jeff-matthews merged commit 48ab69e into master Jun 15, 2020
@ghost
Copy link

ghost commented Jun 15, 2020

Hi @jeff-matthews, thank you for your contribution!
Please, complete Contribution Survey, it will take less than a minute.
Your feedback will help us to improve contribution process.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
2.3.x Magento 2.3 related changes 2.4.0 Internal Dev Differentiates work between community and Magento staff Major Update Significant original updates to existing content
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants