Commit c307fd22ea6a7c6bbaca8d28649ce8f178e3219c
Exists in
spb-stable
and in
3 other branches
Merge branch 'xss/readme' of /home/git/repositories/gitlab/gitlabhq
Showing
4 changed files
with
8 additions
and
4 deletions
Show diff stats
app/helpers/application_helper.rb
| @@ -217,4 +217,8 @@ module ApplicationHelper | @@ -217,4 +217,8 @@ module ApplicationHelper | ||
| 217 | haml_tag :script, "$('." + html_class + "').timeago().tooltip()" | 217 | haml_tag :script, "$('." + html_class + "').timeago().tooltip()" |
| 218 | end.html_safe | 218 | end.html_safe |
| 219 | end | 219 | end |
| 220 | + | ||
| 221 | + def render_markup(file_name, file_content) | ||
| 222 | + GitHub::Markup.render(file_name, file_content).html_safe | ||
| 223 | + end | ||
| 220 | end | 224 | end |
app/views/projects/blob/_text.html.haml
| @@ -4,7 +4,7 @@ | @@ -4,7 +4,7 @@ | ||
| 4 | = markdown(blob.data) | 4 | = markdown(blob.data) |
| 5 | - elsif markup?(blob.name) | 5 | - elsif markup?(blob.name) |
| 6 | .file-content.wiki | 6 | .file-content.wiki |
| 7 | - = raw GitHub::Markup.render(blob.name, blob.data) | 7 | + = render_markup(blob.name, blob.data) |
| 8 | - else | 8 | - else |
| 9 | .file-content.code | 9 | .file-content.code |
| 10 | - unless blob.empty? | 10 | - unless blob.empty? |
app/views/projects/tree/_readme.html.haml
| @@ -9,5 +9,5 @@ | @@ -9,5 +9,5 @@ | ||
| 9 | - elsif plain_text_readme?(readme.name) | 9 | - elsif plain_text_readme?(readme.name) |
| 10 | %pre.clean | 10 | %pre.clean |
| 11 | = readme.data | 11 | = readme.data |
| 12 | - - else | ||
| 13 | - = raw GitHub::Markup.render(readme.name, readme.data) | 12 | + - elsif markup?(readme.name) |
| 13 | + = render_markup(readme.name, readme.data) |
app/views/snippets/_blob.html.haml
| @@ -15,7 +15,7 @@ | @@ -15,7 +15,7 @@ | ||
| 15 | = markdown(@snippet.data) | 15 | = markdown(@snippet.data) |
| 16 | - elsif markup?(@snippet.file_name) | 16 | - elsif markup?(@snippet.file_name) |
| 17 | .file-content.wiki | 17 | .file-content.wiki |
| 18 | - = raw GitHub::Markup.render(@snippet.file_name, @snippet.data) | 18 | + = render_markup(@snippet.file_name, @snippet.data) |
| 19 | - else | 19 | - else |
| 20 | .file-content.code | 20 | .file-content.code |
| 21 | %div{class: user_color_scheme_class} | 21 | %div{class: user_color_scheme_class} |