summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorNihad Abbasov <narkoz.2008@gmail.com>2011-10-30 19:49:09 +0400
committerNihad Abbasov <narkoz.2008@gmail.com>2011-10-30 19:49:09 +0400
commit406076731ec23eb52b52c03fba606aa60cc72926 (patch)
treed8c04f390fa4c2f2ee4b8833603c586862045310 /app/helpers
parent3fa770dd107d01c29741032703c3f69b9ff3f072 (diff)
parent1f3323f9088b897220dc4989ac8da0ef71001ce1 (diff)
downloadgitlab-ce-406076731ec23eb52b52c03fba606aa60cc72926.tar.gz
Merge branch 'refs/heads/markdown_notes' into dev
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 599d1e5c5c9..fbca5ea5d66 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -30,6 +30,10 @@ module ApplicationHelper
end
end
+ def markdown(text)
+ RDiscount.new(text, :autolink, :no_pseudo_protocols, :safelink, :smart, :filter_html).to_html.html_safe
+ end
+
def search_autocomplete_source
projects = current_user.projects.map{ |p| { :label => p.name, :url => project_path(p) } }
default_nav = [