diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-04-07 00:17:21 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-04-07 00:17:21 +0000 |
| commit | 730625f022b1c3b9394cf944f04968a29ac8dc36 (patch) | |
| tree | bf1dea34bd2b412bbd42102423f177859bfce2e6 /lib/banzai/pipeline | |
| parent | 7c6c933c9f7d52b7b78ce5f9656c65fb65d64f35 (diff) | |
| parent | 1575a95b65d4cad91f775ae260b8828cdf303462 (diff) | |
| download | gitlab-ce-730625f022b1c3b9394cf944f04968a29ac8dc36.tar.gz | |
Merge branch 'patch/fix-markdown-preview-wikis' into 'master'
Wiki preview URL converting problem [via Markdown]
Current implementation when rendering the preview, thinks relative links are for project repository files.
We are creating a new preview route that will define correct context data to render for wikis instead.
Fixes #2380, #1184
See merge request !3461
Diffstat (limited to 'lib/banzai/pipeline')
| -rw-r--r-- | lib/banzai/pipeline/wiki_pipeline.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/banzai/pipeline/wiki_pipeline.rb b/lib/banzai/pipeline/wiki_pipeline.rb index 0b5a9e0b2b8..c37b8e71cb0 100644 --- a/lib/banzai/pipeline/wiki_pipeline.rb +++ b/lib/banzai/pipeline/wiki_pipeline.rb @@ -2,8 +2,10 @@ module Banzai module Pipeline class WikiPipeline < FullPipeline def self.filters - @filters ||= super.insert_after(Filter::TableOfContentsFilter, - Filter::GollumTagsFilter) + @filters ||= begin + super.insert_after(Filter::TableOfContentsFilter, Filter::GollumTagsFilter) + .insert_before(Filter::TaskListFilter, Filter::WikiLinkFilter) + end end end end |