diff options
author | Robert Speicher <rspeicher@gmail.com> | 2015-06-12 05:54:21 +0300 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2015-06-14 00:59:12 +0300 |
commit | cdf893bc1597c21b90f8c401bacf79a7c70787fb (patch) | |
tree | 0c30c750b14726c53b37728fe202e681cf0cb15f /doc | |
parent | b9c85393c36027f31bb2e4fd6861cd034fef7fcc (diff) |
Move 2FA docs from "Workflow" to "Profile Settings"
Diffstat (limited to 'doc')
-rw-r--r-- | doc/README.md | 2 | ||||
-rw-r--r-- | doc/profile/2fa.png (renamed from doc/workflow/2fa.png) | bin | 23415 -> 23415 bytes | |||
-rw-r--r-- | doc/profile/2fa_auth.png (renamed from doc/workflow/2fa_auth.png) | bin | 15569 -> 15569 bytes | |||
-rw-r--r-- | doc/profile/README.md | 4 | ||||
-rw-r--r-- | doc/profile/profile.md | 3 | ||||
-rw-r--r-- | doc/profile/two_factor_authentication.md (renamed from doc/workflow/two_factor_authentication.md) | 0 | ||||
-rw-r--r-- | doc/workflow/README.md | 31 |
7 files changed, 20 insertions, 20 deletions
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 Binary files differindex bbf415210d5..bbf415210d5 100644 --- a/doc/workflow/2fa.png +++ b/doc/profile/2fa.png diff --git a/doc/workflow/2fa_auth.png b/doc/profile/2fa_auth.png Binary files differindex 4a4fbe68984..4a4fbe68984 100644 --- a/doc/workflow/2fa_auth.png +++ b/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 index fb215c8b269..fb215c8b269 100644 --- a/doc/workflow/two_factor_authentication.md +++ b/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) |