Download as
Browse Code »

Commit 60ab3bea39c024943c44ac534e8be12ce4953d72

Authored by Dmitriy Zaporozhets
2 parents 7b50a7c9 f4a90bc9
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #1407 from riyad/add-emoji-docs 

Add emoji docs
Showing 1 changed file with 33 additions and 8 deletions   Show diff stats
app/views/help/markdown.html.haml
  Diff comments   View file @60ab3be
... ... @@ -20,6 +20,15 @@
20 20 %li milestones
21 21 %li wiki pages
22 22  
  23 + .span4
  24 + .alert.alert-info
  25 + %p
  26 + If you're not already familiar with Markdown, you should spend 15 minutes and go over the excellent
  27 + %strong= link_to "Markdown Syntax Guide", "http://daringfireball.net/projects/markdown/syntax"
  28 + at Daring Fireball.
  29 +
  30 +.row
  31 + .span8
23 32 %h3 Differences from traditional Markdown
24 33  
25 34 %h4 Newlines
... ... @@ -62,6 +71,29 @@
62 71 %p becomes
63 72 = markdown %Q{```ruby\nrequire 'redcarpet'\nmarkdown = Redcarpet.new("Hello World!")\nputs markdown.to_html\n```}
64 73  
  74 + %h4 Emoji
  75 +
  76 +.row
  77 + .span8
  78 + :ruby
  79 + puts markdown %Q{Sometimes you want to be :cool: and add some :sparkles: to your :speech_balloon:. Well we have a :gift: for you:
  80 +
  81 + :exclamation: You can use emoji anywhere GFM is supported. :sunglasses:
  82 +
  83 + You can use it to point out a :bug: or warn about :monkey:patches. And if someone improves your really :snail: code, send them a :bouquet: or some :candy:. People will :heart: you for that.
  84 +
  85 + If you are :new: to this, don't be :fearful:. You can easily join the emoji :circus_tent:. All you need to do is to :book: up on the supported codes.
  86 + }
  87 +
  88 + .span4
  89 + .alert.alert-info
  90 + %p
  91 + Consult the
  92 + %strong= link_to "Emoji Cheat Sheet", "http://www.emoji-cheat-sheet.com/"
  93 + for a list of all supported emoji codes.
  94 +
  95 +.row
  96 + .span8
65 97 %h4 Special GitLab references
66 98  
67 99 %p
... ... @@ -93,12 +125,5 @@
93 125 %p For example in your #{link_to @project.name, project_path(@project)} project, writing:
94 126 %pre= "This is related to ##{issue.id}. @#{current_user.name} is working on solving it."
95 127 %p becomes:
96   - %pre= gfm "This is related to ##{issue.id}. @#{current_user.name} is working on solving it."
  128 + = markdown "This is related to ##{issue.id}. @#{current_user.name} is working on solving it."
97 129 - @project = nil # Prevent this from bubbling up to page title
98   -
99   - .span4.right
100   - .alert.alert-info
101   - %p
102   - If you're not already familiar with Markdown, you should spend 15 minutes and go over the excellent
103   - %strong= link_to "Markdown Syntax Guide", "http://daringfireball.net/projects/markdown/syntax"
104   - at Daring Fireball.
... ...