Commit 34ba4e135202db79ceb29c738ee476c5f54acf50
1 parent
72c6be2d
Exists in
master
and in
4 other branches
Gitlab Markdown help page
Showing
4 changed files
with
32 additions
and
2 deletions
Show diff stats
app/views/help/index.html.haml
| @@ -0,0 +1,25 @@ | @@ -0,0 +1,25 @@ | ||
| 1 | +- bash_lexer = Pygments::Lexer[:bash] | ||
| 2 | +%h3.page_title Gitlab Markdown | ||
| 3 | +.back_link | ||
| 4 | + = link_to help_path do | ||
| 5 | + ← to index | ||
| 6 | +%hr | ||
| 7 | + | ||
| 8 | +%p.slead We extend Markdown with some GITLAB specific syntax. It allows you to link to: | ||
| 9 | + | ||
| 10 | +%ul | ||
| 11 | + %li issues (#123) | ||
| 12 | + %li merge request (!123) | ||
| 13 | + %li commits (1234567) | ||
| 14 | + %li team members (@foo) | ||
| 15 | + %li snippets ($123) | ||
| 16 | + | ||
| 17 | +%p.slead in | ||
| 18 | + | ||
| 19 | +%ul | ||
| 20 | + %li commit messages | ||
| 21 | + %li notes/comments/wall posts | ||
| 22 | + %li issues | ||
| 23 | + %li merge requests | ||
| 24 | + %li milestones | ||
| 25 | + %li wiki pages |
app/views/notes/_form.html.haml
| @@ -8,7 +8,9 @@ | @@ -8,7 +8,9 @@ | ||
| 8 | = f.hidden_field :noteable_id | 8 | = f.hidden_field :noteable_id |
| 9 | = f.hidden_field :noteable_type | 9 | = f.hidden_field :noteable_type |
| 10 | = f.text_area :note, :size => 255 | 10 | = f.text_area :note, :size => 255 |
| 11 | - %p.hint Markdown is enabled. | 11 | + %p.hint |
| 12 | + = link_to "Gitlab Markdown", help_markdown_path, :target => '_blank' | ||
| 13 | + is enabled. | ||
| 12 | 14 | ||
| 13 | .row.note_advanced_opts.hide | 15 | .row.note_advanced_opts.hide |
| 14 | .span4 | 16 | .span4 |
| @@ -31,5 +33,4 @@ | @@ -31,5 +33,4 @@ | ||
| 31 | .input= f.file_field :attachment, :class => "input-file" | 33 | .input= f.file_field :attachment, :class => "input-file" |
| 32 | %span Any file less than 10 MB | 34 | %span Any file less than 10 MB |
| 33 | 35 | ||
| 34 | - | ||
| 35 | = f.submit 'Add Comment', :class => "btn primary submit_note", :id => "submit_note" | 36 | = f.submit 'Add Comment', :class => "btn primary submit_note", :id => "submit_note" |
config/routes.rb
| @@ -29,6 +29,7 @@ Gitlab::Application.routes.draw do | @@ -29,6 +29,7 @@ Gitlab::Application.routes.draw do | ||
| 29 | get 'help/api' => 'help#api' | 29 | get 'help/api' => 'help#api' |
| 30 | get 'help/web_hooks' => 'help#web_hooks' | 30 | get 'help/web_hooks' => 'help#web_hooks' |
| 31 | get 'help/system_hooks' => 'help#system_hooks' | 31 | get 'help/system_hooks' => 'help#system_hooks' |
| 32 | + get 'help/markdown' => 'help#markdown' | ||
| 32 | 33 | ||
| 33 | # | 34 | # |
| 34 | # Admin Area | 35 | # Admin Area |