summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-25 10:21:03 -0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-25 10:21:03 -0700
commit6199da0cb49d2e30071d2bbb08735ce2265c7aff (patch)
tree969212c0b02d2bae327501b1c7098014b9ded03a /app
parenteda120dc4d8599e293afec7789847fd22ca0c1b0 (diff)
parent057c8c344b6518cb50b81607e0f88734fc164a9e (diff)
downloadgitlab-ce-6199da0cb49d2e30071d2bbb08735ce2265c7aff.tar.gz
Merge pull request #8007 from mr-vinn/markdown-tags
Allow HTML tags in user Markdown input
Diffstat (limited to 'app')
-rw-r--r--app/helpers/gitlab_markdown_helper.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/app/helpers/gitlab_markdown_helper.rb b/app/helpers/gitlab_markdown_helper.rb
index 08221aaa2f8..7ca3f058636 100644
--- a/app/helpers/gitlab_markdown_helper.rb
+++ b/app/helpers/gitlab_markdown_helper.rb
@@ -35,7 +35,6 @@ module GitlabMarkdownHelper
user_color_scheme_class,
{
# see https://github.com/vmg/redcarpet#darling-i-packed-you-a-couple-renderers-for-lunch-
- filter_html: true,
with_toc_data: true,
safe_links_only: true
}.merge(options))