From 9deda68257962e82f713d484870f22418073b367 Mon Sep 17 00:00:00 2001
From: Vinnie Okada <vokada@mrvinn.com>
Date: Sat, 28 Mar 2015 08:58:30 -0600
Subject: [PATCH] Parse GFM references after sanitizing
Parse GFM references - labels, issues, MRs, etc. - after calling the
HTML Pipeline `SanitizationFilter` so that we can use non-whitelisted
attributes like `style`.
---
lib/gitlab/markdown.rb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb
index 41bb8d08924..48a589db837 100644
--- a/lib/gitlab/markdown.rb
+++ b/lib/gitlab/markdown.rb
@@ -70,8 +70,6 @@ module Gitlab
# TODO: add popups with additional information
- text = parse(text, project)
-
# Insert pre block extractions
text.gsub!(/\{gfm-extraction-(\h{32})\}/) do
insert_piece($1)
@@ -120,6 +118,8 @@ module Gitlab
text = result[:output].to_html(save_with: saveoptions)
+ text = parse(text, project)
+
if options[:parse_tasks]
text = parse_tasks(text)
end
@@ -141,7 +141,7 @@ module Gitlab
@extractions[id]
end
- # Private: Parses text for references and emoji
+ # Private: Parses text for references
#
# text - Text to parse
#
--
GitLab