summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-08-22 21:03:02 +0000
committerRobert Speicher <robert@gitlab.com>2016-08-22 21:03:02 +0000
commita79ff9346b73079148cc4ecc81da82804bb51f3c (patch)
treede4ca37d1370049821ebc6c8ad71033727f0651f
parent86d3aa5bc49a9c0c22deaea78bad9895b5ae8d01 (diff)
parentd4e44e90943b842de97df21946cf19a7ffecee83 (diff)
downloadgitlab-ce-a79ff9346b73079148cc4ecc81da82804bb51f3c.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 f4212350c2d..6c14f48d41b 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('user/project/slash_commands'), target: '_blank', tabindex: -1