From 8c22996d8ca2883be6728fafaa4f72c853342c53 Mon Sep 17 00:00:00 2001 From: scarletspiderfan <102716146+scarletspiderfan@users.noreply.github.com> Date: Mon, 12 Dec 2022 17:26:30 -0600 Subject: [PATCH 1/3] adds warning for 2fa Adds a warning to let admins know that non-2FA accounts will be removed during an org transfer where the new enterprise enforces a 2FA requirement. --- .../adding-organizations-to-your-enterprise.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/content/admin/user-management/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise.md b/content/admin/user-management/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise.md index 2044b990b12a..feb2b14c64fc 100644 --- a/content/admin/user-management/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise.md +++ b/content/admin/user-management/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise.md @@ -82,6 +82,9 @@ Enterprise owners can transfer existing organizations between enterprise account {% endnote %} +> **Warning** +> If you are migrating to an enterprise that enforces 2FA requirements, non-2FA users will be removed during the migration. We recommend enabling 2FA for all accounts prior to transferring organizations. + {% data reusables.enterprise-accounts.access-enterprise %} 1. Next to the organization you want to transfer, select the {% octicon "gear" width="16" aria-label="Gear" %} dropdown, and then click **Transfer organization**. ![Screenshot of the transfer button](/assets/images/help/business-accounts/org-transfer-button.png) From 4a5b14cf7d8cafd55dde42f8e369b4933e1d79f6 Mon Sep 17 00:00:00 2001 From: scarletspiderfan <102716146+scarletspiderfan@users.noreply.github.com> Date: Wed, 14 Dec 2022 15:04:42 -0600 Subject: [PATCH 2/3] Update adding-organizations-to-your-enterprise.md --- .../adding-organizations-to-your-enterprise.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/content/admin/user-management/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise.md b/content/admin/user-management/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise.md index feb2b14c64fc..89bac83429cb 100644 --- a/content/admin/user-management/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise.md +++ b/content/admin/user-management/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise.md @@ -27,6 +27,7 @@ You can add new organizations to your enterprise account. If you do not use {% d After you add an existing organization to your enterprise, the organization's resources remain accessible to members at the same URLs, and the following changes will apply. +- Organization users who do NOT use 2 factor authentication will be removed if 2FA is required by the Enterprise - The organization's members will become members of the enterprise, and {% data variables.product.company_short %} will bill the enterprise account for the organization's usage. You must ensure that the enterprise account has enough licenses to accommodate any new members. For more information, see "[About billing for your enterprise](/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise)." - Enterprise owners can manage their role within the organization. For more information, see "[Managing your role in an organization owned by your enterprise](/admin/user-management/managing-organizations-in-your-enterprise/managing-your-role-in-an-organization-owned-by-your-enterprise)." - Any policies applied to the enterprise will apply to the organization. For more information, see "[About enterprise policies](/admin/policies/enforcing-policies-for-your-enterprise/about-enterprise-policies)." @@ -82,8 +83,6 @@ Enterprise owners can transfer existing organizations between enterprise account {% endnote %} -> **Warning** -> If you are migrating to an enterprise that enforces 2FA requirements, non-2FA users will be removed during the migration. We recommend enabling 2FA for all accounts prior to transferring organizations. {% data reusables.enterprise-accounts.access-enterprise %} 1. Next to the organization you want to transfer, select the {% octicon "gear" width="16" aria-label="Gear" %} dropdown, and then click **Transfer organization**. From 50b7f7ea435767ff39bc2627f0111de08ecc23e1 Mon Sep 17 00:00:00 2001 From: Laura Coursen Date: Thu, 15 Dec 2022 09:40:00 -0600 Subject: [PATCH 3/3] Add :nail_care: --- .../adding-organizations-to-your-enterprise.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/content/admin/user-management/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise.md b/content/admin/user-management/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise.md index 89bac83429cb..1aa4e497b8dd 100644 --- a/content/admin/user-management/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise.md +++ b/content/admin/user-management/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise.md @@ -27,7 +27,7 @@ You can add new organizations to your enterprise account. If you do not use {% d After you add an existing organization to your enterprise, the organization's resources remain accessible to members at the same URLs, and the following changes will apply. -- Organization users who do NOT use 2 factor authentication will be removed if 2FA is required by the Enterprise +- If two-factor authentication (2FA) is required by the enterprise, organization members who do not use 2FA will be removed from the organization. - The organization's members will become members of the enterprise, and {% data variables.product.company_short %} will bill the enterprise account for the organization's usage. You must ensure that the enterprise account has enough licenses to accommodate any new members. For more information, see "[About billing for your enterprise](/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise)." - Enterprise owners can manage their role within the organization. For more information, see "[Managing your role in an organization owned by your enterprise](/admin/user-management/managing-organizations-in-your-enterprise/managing-your-role-in-an-organization-owned-by-your-enterprise)." - Any policies applied to the enterprise will apply to the organization. For more information, see "[About enterprise policies](/admin/policies/enforcing-policies-for-your-enterprise/about-enterprise-policies)." @@ -83,7 +83,6 @@ Enterprise owners can transfer existing organizations between enterprise account {% endnote %} - {% data reusables.enterprise-accounts.access-enterprise %} 1. Next to the organization you want to transfer, select the {% octicon "gear" width="16" aria-label="Gear" %} dropdown, and then click **Transfer organization**. ![Screenshot of the transfer button](/assets/images/help/business-accounts/org-transfer-button.png)