diff options
| author | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-10-24 18:53:06 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-10-24 18:53:06 +0000 |
| commit | b81db02d4235802218521314c3ee2ca65bb591bd (patch) | |
| tree | 477995982c6fa64f8e23c4a088b1c541c9ef6573 /lib | |
| parent | 4789cbdc5f04f235fc5562003b79df4e6ca9a1ab (diff) | |
| parent | 37a393466ae159499d49c75b082465c40ce60b37 (diff) | |
| download | gitlab-ce-b81db02d4235802218521314c3ee2ca65bb591bd.tar.gz | |
Merge branch 'security-wiki-rdoc-content-12-3-ce' into '12-3-stable'
Pass all wiki markup formats through our Banzai pipeline filters
See merge request gitlab/gitlabhq!3478
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) |