summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-08-22 21:03:02 +0000
committerRuben Davila <rdavila84@gmail.com>2016-08-23 16:20:25 -0500
commit9a4e4c01c0201b53d932e9dd698ad8a69bb6ef03 (patch)
treea28e7905a88658beb022098d247b0076aa7d0038
parent1ad13309971490adeff3e855de841a90b2146583 (diff)
downloadgitlab-ce-9a4e4c01c0201b53d932e9dd698ad8a69bb6ef03.tar.gz
Merge branch 'change-markdown-help-location' into 'master'
Fix location of markdown help Resolves #21208, and incorrect link to the markdown style guide See merge request !5945
-rw-r--r--app/views/projects/notes/_hints.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/notes/_hints.html.haml b/app/views/projects/notes/_hints.html.haml
index cf6e14648cc..ba41406a4aa 100644
--- a/app/views/projects/notes/_hints.html.haml
+++ b/app/views/projects/notes/_hints.html.haml
@@ -2,7 +2,7 @@
.comment-toolbar.clearfix
.toolbar-text
Styling with
- = link_to 'Markdown', help_page_path('markdown/markdown'), target: '_blank', tabindex: -1
+ = 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