summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-01-08 16:32:03 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-01-08 16:32:03 +0200
commitd6c037de81096680db07397a44a0824355c703c8 (patch)
tree7aecccc578eed1aafa21926ae30304c3a2fa768a /app/helpers
parent03770698417563abe70fdea223700ca370e9f062 (diff)
downloadgitlab-ce-d6c037de81096680db07397a44a0824355c703c8.tar.gz
Dont render README with markup if format is not compatible
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/application_helper.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index cd3afd5cc32..0db43fa1809 100644
--- a/app/helpers/application_helper.rb
+++ b/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