summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-04-07 16:53:15 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-04-20 13:01:42 -0400
commit77a6746a75325c59bd5c081041ac6dc374e6394d (patch)
tree1b8aafed267fadee4cf7cea6d7cbc903eb7c96e8 /lib
parent02809e1cf874122bab3e269ae7362be3ad8a87bd (diff)
downloadgitlab-ce-77a6746a75325c59bd5c081041ac6dc374e6394d.tar.gz
Run SanitizationFilter before our reference filters
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/markdown.rb9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb
index 93c279edc32..1babdc476bd 100644
--- a/lib/gitlab/markdown.rb
+++ b/lib/gitlab/markdown.rb
@@ -92,9 +92,14 @@ module Gitlab
# Custom filters for html-pipeline:
#
+ # SanitizationFilter should come first so that all generated reference HTML
+ # goes through untouched.
+ #
# See https://gitlab.com/gitlab-org/html-pipeline-gitlab for more filters
def filters
[
+ HTML::Pipeline::SanitizationFilter,
+
Gitlab::Markdown::UserReferenceFilter,
Gitlab::Markdown::IssueReferenceFilter,
Gitlab::Markdown::ExternalIssueReferenceFilter,
@@ -103,8 +108,8 @@ module Gitlab
Gitlab::Markdown::CommitRangeReferenceFilter,
Gitlab::Markdown::CommitReferenceFilter,
Gitlab::Markdown::LabelReferenceFilter,
- HTML::Pipeline::Gitlab::GitlabEmojiFilter,
- HTML::Pipeline::SanitizationFilter
+
+ HTML::Pipeline::Gitlab::GitlabEmojiFilter
]
end