summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-04-27 18:56:37 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-04-30 16:35:25 -0400
commite46d1cdd8bd4cc12e8c8e8fdce10b3114a17d95e (patch)
treefc6b79dd86cd193ce86093c8df8ab91da338057d /app/helpers
parentaa2cc670fe2c9de772c82d90df4ee2d8a77c23fc (diff)
downloadgitlab-ce-e46d1cdd8bd4cc12e8c8e8fdce10b3114a17d95e.tar.gz
Add Gitlab::Markdown::SanitizationFilter
This just extends the HTML::Pipeline::SanitizationFilter with our custom whitelist.
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/gitlab_markdown_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/gitlab_markdown_helper.rb b/app/helpers/gitlab_markdown_helper.rb
index 7dbffaae5f9..24263a0f619 100644
--- a/app/helpers/gitlab_markdown_helper.rb
+++ b/app/helpers/gitlab_markdown_helper.rb
@@ -34,7 +34,7 @@ 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, {
- # Handled further down the line by HTML::Pipeline::SanitizationFilter
+ # Handled further down the line by Gitlab::Markdown::SanitizationFilter
escape_html: false
}.merge(options))