summaryrefslogtreecommitdiff
path: root/lib/banzai
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-05-19 18:10:39 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-05-19 18:10:39 +0000
commite4fc62c0af80cfaaa907aea83ae4012e06a1f9e4 (patch)
tree77758b2c2b0ae196be08358f6081a37518ec4317 /lib/banzai
parenta6508d0028191c42620414994b2fe4ce62467a73 (diff)
downloadgitlab-ce-e4fc62c0af80cfaaa907aea83ae4012e06a1f9e4.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/banzai')
-rw-r--r--lib/banzai/pipeline/markup_pipeline.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/banzai/pipeline/markup_pipeline.rb b/lib/banzai/pipeline/markup_pipeline.rb
index c86d5f08ded..17a73f29afb 100644
--- a/lib/banzai/pipeline/markup_pipeline.rb
+++ b/lib/banzai/pipeline/markup_pipeline.rb
@@ -9,7 +9,8 @@ module Banzai
Filter::AssetProxyFilter,
Filter::ExternalLinkFilter,
Filter::PlantumlFilter,
- Filter::SyntaxHighlightFilter
+ Filter::SyntaxHighlightFilter,
+ Filter::KrokiFilter
]
end