summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-04-27 18:54:13 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-04-30 16:35:25 -0400
commitaa2cc670fe2c9de772c82d90df4ee2d8a77c23fc (patch)
tree403c34f8589864232db009a4960c7041d3a456c4 /app/helpers
parent2d9edcada5135d1f72a2c284e93d8e5b18e00008 (diff)
downloadgitlab-ce-aa2cc670fe2c9de772c82d90df4ee2d8a77c23fc.tar.gz
Add Gitlab::Markdown::AutolinkFilter
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/gitlab_markdown_helper.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/app/helpers/gitlab_markdown_helper.rb b/app/helpers/gitlab_markdown_helper.rb
index 48d754dcf7e..7dbffaae5f9 100644
--- a/app/helpers/gitlab_markdown_helper.rb
+++ b/app/helpers/gitlab_markdown_helper.rb
@@ -34,9 +34,8 @@ module GitlabMarkdownHelper
# see https://github.com/vmg/redcarpet#darling-i-packed-you-a-couple-renderers-for-lunch
rend = Redcarpet::Render::GitlabHTML.new(self, user_color_scheme_class, {
- safe_links_only: true,
# Handled further down the line by HTML::Pipeline::SanitizationFilter
- escape_html: false
+ escape_html: false
}.merge(options))
# see https://github.com/vmg/redcarpet#and-its-like-really-simple-to-use
@@ -44,7 +43,6 @@ module GitlabMarkdownHelper
no_intra_emphasis: true,
tables: true,
fenced_code_blocks: true,
- autolink: true,
strikethrough: true,
lax_spacing: true,
space_after_headers: true,