Merge branch 'xss/readme' of /home/git/repositories/gitlab/gitlabhq

app/helpers/application_helper.rb

@@ -217,4 +217,8 @@ module ApplicationHelper
       haml_tag :script, "$('." + html_class + "').timeago().tooltip()"
     end.html_safe
   end
+
+  def render_markup(file_name, file_content)
+    GitHub::Markup.render(file_name, file_content).html_safe
+  end
 end

app/views/projects/blob/_text.html.haml

@@ -4,7 +4,7 @@
       = markdown(blob.data)
 - elsif markup?(blob.name)
   .file-content.wiki
-    = raw GitHub::Markup.render(blob.name, blob.data)
+    = render_markup(blob.name, blob.data)
 - else
   .file-content.code
     - unless blob.empty?

app/views/projects/tree/_readme.html.haml

@@ -9,5 +9,5 @@
     - elsif plain_text_readme?(readme.name)
       %pre.clean
         = readme.data
-    - else
-      = raw GitHub::Markup.render(readme.name, readme.data)
+    - elsif markup?(readme.name)
+      = render_markup(readme.name, readme.data)

app/views/snippets/_blob.html.haml

@@ -15,7 +15,7 @@
           = markdown(@snippet.data)
     - elsif markup?(@snippet.file_name)
       .file-content.wiki
-        = raw GitHub::Markup.render(@snippet.file_name, @snippet.data)
+        = render_markup(@snippet.file_name, @snippet.data)
     - else
       .file-content.code
         %div{class: user_color_scheme_class}