Gitlab Markdown help page

3 files changed, 31 insertions, 2 deletions

diff --git a/app/views/help/index.html.haml b/app/views/help/index.html.haml
index e9602e33037..66f7c722d67 100644
--- a/app/views/help/index.html.haml
+++ b/app/views/help/index.html.haml
@@ -28,3 +28,6 @@
 
   %li
     %h5= link_to "API", help_api_path
+
+  %li
+    %h5= link_to "Gitlab Markdown", help_markdown_path
diff --git a/app/views/help/markdown.html.haml b/app/views/help/markdown.html.haml
new file mode 100644
index 00000000000..8d6fb2a590f
--- /dev/null
+++ b/app/views/help/markdown.html.haml
@@ -0,0 +1,25 @@
+- bash_lexer = Pygments::Lexer[:bash]
+%h3.page_title Gitlab Markdown
+.back_link
+  = link_to help_path do 
+    ← to index
+%hr
+
+%p.slead We extend Markdown with some GITLAB specific syntax. It allows you to link to:
+
+%ul
+  %li issues (#123)
+  %li merge request (!123)
+  %li commits (1234567)
+  %li team members (@foo)
+  %li snippets ($123)
+
+%p.slead in
+
+%ul
+  %li commit messages
+  %li notes/comments/wall posts
+  %li issues
+  %li merge requests
+  %li milestones
+  %li wiki pages
diff --git a/app/views/notes/_form.html.haml b/app/views/notes/_form.html.haml
index aeaf57e6ddc..55f69f8f97d 100644
--- a/app/views/notes/_form.html.haml
+++ b/app/views/notes/_form.html.haml
@@ -8,7 +8,9 @@
   = f.hidden_field :noteable_id
   = f.hidden_field :noteable_type
   = f.text_area :note,  :size => 255
-  %p.hint Markdown is enabled.
+  %p.hint
+    = link_to "Gitlab Markdown", help_markdown_path, :target => '_blank'
+    is enabled.
 
   .row.note_advanced_opts.hide
     .span4
@@ -31,5 +33,4 @@
           .input= f.file_field :attachment, :class => "input-file"
         %span Any file less than 10 MB
 
-
   = f.submit 'Add Comment', :class => "btn primary submit_note", :id => "submit_note"