diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-08-22 16:51:38 +0300 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2016-08-24 00:32:40 +0300 |
| commit | 14e7ab49fe22c7b102d26a6d7eddcb704cc70ba0 (patch) | |
| tree | bea38af293e7598801960eac8ee5707436f99465 | |
| parent | 82368d41687613af98726951e3316be4ca5e7d77 (diff) | |
Merge branch 'doc-slash-commands-location' into 'master'
Change slash commands docs location
See merge request !5937
| -rw-r--r-- | app/views/projects/notes/_hints.html.haml | 2 | ||||
| -rw-r--r-- | doc/user/project/slash_commands.md (renamed from doc/workflow/slash_commands.md) | 2 | ||||
| -rw-r--r-- | doc/workflow/README.md | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/notes/_hints.html.haml b/app/views/projects/notes/_hints.html.haml index ba41406a4aa..6c14f48d41b 100644 --- a/app/views/projects/notes/_hints.html.haml +++ b/app/views/projects/notes/_hints.html.haml @@ -5,7 +5,7 @@ = link_to 'Markdown', help_page_path('user/markdown'), target: '_blank', tabindex: -1 - if supports_slash_commands and - = link_to 'slash commands', help_page_path('workflow/slash_commands'), target: '_blank', tabindex: -1 + = link_to 'slash commands', help_page_path('user/project/slash_commands'), target: '_blank', tabindex: -1 are - else is diff --git a/doc/workflow/slash_commands.md b/doc/user/project/slash_commands.md index 91d69d4e77e..11e1574f772 100644 --- a/doc/workflow/slash_commands.md +++ b/doc/user/project/slash_commands.md @@ -26,5 +26,5 @@ do. | `/done` | Mark todo as done | | `/subscribe` | Subscribe | | `/unsubscribe` | Unsubscribe | -| `/due <in 2 days | this Friday | December 31st>` | Set due date | +| `/due <in 2 days or this Friday or December 31st>` | Set due date | | `/remove_due_date` | Remove due date | diff --git a/doc/workflow/README.md b/doc/workflow/README.md index 8979600735a..0cf56449de2 100644 --- a/doc/workflow/README.md +++ b/doc/workflow/README.md @@ -8,7 +8,6 @@ - [Groups](groups.md) - [Issue Board](../user/project/issue_board.md) - [Keyboard shortcuts](shortcuts.md) -- [Slash commands](slash_commands.md) - [File finder](file_finder.md) - [Labels](../user/project/labels.md) - [Notification emails](notifications.md) @@ -16,6 +15,7 @@ - [Project forking workflow](forking_workflow.md) - [Project users](add-user/add-user.md) - [Protected branches](../user/project/protected_branches.md) +- [Slash commands](../user/project/slash_commands.md) - [Sharing a project with a group](share_with_group.md) - [Share projects with other groups](share_projects_with_other_groups.md) - [Web Editor](web_editor.md) |