From cdf893bc1597c21b90f8c401bacf79a7c70787fb Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Thu, 11 Jun 2015 22:54:21 -0400 Subject: [PATCH] Move 2FA docs from "Workflow" to "Profile Settings" --- doc/README.md | 2 +- doc/{workflow => profile}/2fa.png | Bin doc/{workflow => profile}/2fa_auth.png | Bin doc/profile/README.md | 4 +++ doc/profile/profile.md | 3 -- .../two_factor_authentication.md | 0 doc/workflow/README.md | 31 +++++++++--------- 7 files changed, 20 insertions(+), 20 deletions(-) rename doc/{workflow => profile}/2fa.png (100%) rename doc/{workflow => profile}/2fa_auth.png (100%) create mode 100644 doc/profile/README.md delete mode 100644 doc/profile/profile.md rename doc/{workflow => profile}/two_factor_authentication.md (100%) diff --git a/doc/README.md b/doc/README.md index 451abf8b792..28459613252 100644 --- a/doc/README.md +++ b/doc/README.md @@ -7,7 +7,7 @@ - [Importing to GitLab](workflow/importing/README.md). - [Markdown](markdown/markdown.md) GitLab's advanced formatting system. - [Permissions](permissions/permissions.md) Learn what each role in a project (guest/reporter/developer/master/owner) can do. -- [Profile Settings](profile/profile.md) +- [Profile Settings](profile/README.md) - [Project Services](project_services/project_services.md) Integrate a project with external services, such as CI and chat. - [Public access](public_access/public_access.md) Learn how you can allow public and internal access to projects. - [SSH](ssh/README.md) Setup your ssh keys and deploy keys for secure access to your projects. diff --git a/doc/workflow/2fa.png b/doc/profile/2fa.png similarity index 100% rename from doc/workflow/2fa.png rename to doc/profile/2fa.png diff --git a/doc/workflow/2fa_auth.png b/doc/profile/2fa_auth.png similarity index 100% rename from doc/workflow/2fa_auth.png rename to doc/profile/2fa_auth.png diff --git a/doc/profile/README.md b/doc/profile/README.md new file mode 100644 index 00000000000..6f8359d87fa --- /dev/null +++ b/doc/profile/README.md @@ -0,0 +1,4 @@ +# Profile Settings + +- [Preferences](preferences.md) +- [Two-factor Authentication (2FA)](two_factor_authentication.md) diff --git a/doc/profile/profile.md b/doc/profile/profile.md deleted file mode 100644 index 032d62cf884..00000000000 --- a/doc/profile/profile.md +++ /dev/null @@ -1,3 +0,0 @@ -# Profile Settings - -- [Preferences](preferences.md) diff --git a/doc/workflow/two_factor_authentication.md b/doc/profile/two_factor_authentication.md similarity index 100% rename from doc/workflow/two_factor_authentication.md rename to doc/profile/two_factor_authentication.md 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) -- GitLab