diff options
| author | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-10-24 21:53:28 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-10-24 21:53:28 +0300 |
| commit | a2c31462f7fc013f41e7ca914a0b96869aa42c73 (patch) | |
| tree | a024c4d951af465dc997f9f43ba6c137c22f7d0c /lib | |
| parent | 6df4db1f8df1240711d84586a7b7a9867ca3b57b (diff) | |
| parent | bc534868ec856410ca2664cd7fc9c7f89a48a277 (diff) | |
Merge branch 'security-wiki-rdoc-content-12-4-ce' into '12-4-stable'
Pass all wiki markup formats through our Banzai pipeline filters
See merge request gitlab/gitlabhq!3485
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) |