diff options
author | Vinnie Okada <vokada@mrvinn.com> | 2015-03-28 08:58:30 -0600 |
---|---|---|
committer | Vinnie Okada <vokada@mrvinn.com> | 2015-03-28 08:58:30 -0600 |
commit | 9deda68257962e82f713d484870f22418073b367 (patch) | |
tree | 95d320f7efdf22e2cf4890404b13bb3a90f81f85 /lib | |
parent | 3d4c2d0b510f15ac3f0abe6ba4468dd019b06278 (diff) | |
download | gitlab-ce-9deda68257962e82f713d484870f22418073b367.tar.gz |
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`.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/markdown.rb | 6 |
1 files 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 # |