Move 2FA docs from "Workflow" to "Profile Settings"

4 files changed, 15 insertions, 83 deletions

diff --git a/doc/workflow/2fa.png b/doc/workflow/2fa.png
deleted file mode 100644
index bbf415210d5..00000000000
--- a/doc/workflow/2fa.png
+++ /dev/null
diff --git a/doc/workflow/2fa_auth.png b/doc/workflow/2fa_auth.png
deleted file mode 100644
index 4a4fbe68984..00000000000
--- a/doc/workflow/2fa_auth.png
+++ /dev/null
diff --git a/doc/workflow/README.md b/doc/workflow/README.md
index 70a8179c8eb..f1959d30139 100644
--- a/doc/workflow/README.md
+++ b/doc/workflow/README.md
@@ -1,16 +1,15 @@
-# Workflow

-

-- [Authorization for merge requests](authorization_for_merge_requests.md)

-- [Change your time zone](timezone.md)

-- [Feature branch workflow](workflow.md)

-- [GitLab Flow](gitlab_flow.md)

-- [Groups](groups.md)

-- [Keyboard shortcuts](shortcuts.md)

-- [Labels](labels.md)

-- [Notifications](notifications.md)

-- [Project Features](project_features.md)

-- [Project forking workflow](forking_workflow.md)

-- [Protected branches](protected_branches.md)

-- [Two-factor Authentication (2FA)](two_factor_authentication.md)

-- [Web Editor](web_editor.md)

-- ["Work In Progress" Merge Requests](wip_merge_requests.md)
\ No newline at end of file
+# Workflow
+
+- [Authorization for merge requests](authorization_for_merge_requests.md)
+- [Change your time zone](timezone.md)
+- [Feature branch workflow](workflow.md)
+- [GitLab Flow](gitlab_flow.md)
+- [Groups](groups.md)
+- [Keyboard shortcuts](shortcuts.md)
+- [Labels](labels.md)
+- [Notifications](notifications.md)
+- [Project Features](project_features.md)
+- [Project forking workflow](forking_workflow.md)
+- [Protected branches](protected_branches.md)
+- [Web Editor](web_editor.md)
+- ["Work In Progress" Merge Requests](wip_merge_requests.md)
diff --git a/doc/workflow/two_factor_authentication.md b/doc/workflow/two_factor_authentication.md
deleted file mode 100644
index fb215c8b269..00000000000
--- a/doc/workflow/two_factor_authentication.md
+++ /dev/null
@@ -1,67 +0,0 @@
-# Two-factor Authentication (2FA)
-
-Two-factor Authentication (2FA) provides an additional level of security to your
-GitLab account. Once enabled, in addition to supplying your username and
-password to login, you'll be prompted for a code generated by an application on
-your phone.
-
-By enabling 2FA, the only way someone other than you can log into your account
-is to know your username and password *and* have access to your phone.
-
-## Enabling 2FA
-
-**In GitLab:**
-
-1. Log in to your GitLab account.
-1. Go to your **Profile Settings**.
-1. Go to **Account**.
-1. Click **Enable Two-factor Authentication**.
-
-![Two-factor setup](2fa.png)
-
-**On your phone:**
-
-1. Install a compatible application. We recommend [Google Authenticator]
-\(proprietary\) or [FreeOTP] \(open source\).
-1. In the application, add a new entry in one of two ways:
-    * Scan the code with your phone's camera to add the entry automatically.
-    * Enter the details provided to add the entry manually.
-
-**In GitLab:**
-
-1. Enter the six-digit pin number from the entry on your phone into the **Pin
-   code** field.
-1. Click **Submit**.
-
-If the pin you entered was correct, you'll see a message indicating that
-Two-factor Authentication has been enabled, and you'll be presented with a list
-of recovery codes.
-
-## Recovery Codes
-
-Should you ever lose access to your phone, you can use one of the ten provided
-backup codes to login to your account. We suggest copying or printing them for
-storage in a safe place. **Each code can be used only once** to log in to your
-account.
-
-If you lose the recovery codes or just want to generate new ones, you can do so
-from the **Profile Settings** > **Account** page where you first enabled 2FA.
-
-## Logging in with 2FA Enabled
-
-Logging in with 2FA enabled is only slightly different than a normal login.
-Enter your username and password credentials as you normally would, and you'll
-be presented with a second prompt for an authentication code. Enter the pin from
-your phone's application or a recovery code to log in.
-
-![Two-factor authentication on sign in](2fa_auth.png)
-
-## Disabling 2FA
-
-1. Log in to your GitLab account.
-1. Go to your **Profile Settings**.
-1. Go to **Account**.
-1. Click **Disable Two-factor Authentication**.
-
-[Google Authenticator]: https://support.google.com/accounts/answer/1066447?hl=en
-[FreeOTP]: https://fedorahosted.org/freeotp/