diff options
| author | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-10-29 18:58:09 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-10-29 18:58:09 +0300 |
| commit | af84dec405c3f8d13220ee3f98eb4b2f0276a93d (patch) | |
| tree | 4219c0b7d7c706eeb2a9550791c81f97bb937012 /lib | |
| parent | d7f9136904d164afd7b1ac236f6f814729083e61 (diff) | |
| parent | 49a78d419d2379b06fd917173717a9fe8174697a (diff) | |
Merge branch 'security-wiki-rdoc-content-ce' into 'master'
Pass all wiki markup formats through our Banzai pipeline filters
See merge request gitlab/gitlabhq!3461
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/other_markup.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/other_markup.rb b/lib/gitlab/other_markup.rb index bc467486eee..0dd6b8a809c 100644 --- a/lib/gitlab/other_markup.rb +++ b/lib/gitlab/other_markup.rb @@ -10,7 +10,7 @@ module Gitlab def self.render(file_name, input, context) html = GitHub::Markup.render(file_name, input) .force_encoding(input.encoding) - context[:pipeline] = :markup + context[:pipeline] ||= :markup html = Banzai.render(html, context) |