diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-01-14 15:08:42 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-01-14 15:08:42 +0000 |
| commit | b6454fef568352b9fffc2c4cb194c98c4af2efa9 (patch) | |
| tree | 8d3607050daae37156d9f5f6979c7ac15f16fe93 /app/helpers | |
| parent | b6ae2def2cb2b1da3ddcb3ceee556628a1147cc4 (diff) | |
| parent | 2450916dc6d8e022ad03350e42d7df1e1711905a (diff) | |
| download | gitlab-ce-b6454fef568352b9fffc2c4cb194c98c4af2efa9.tar.gz | |
Merge branch 'import-gh-wiki' into 'master'
Import GitHub wiki into GitLab
Closes #2834
GitHub doesn’t apply any constraints to theirs wiki slug allowing chars like ,, :, *, etc, we need to remove our constraints or some wiki pages will not be available after they are imported.
Some wikis use the Gollum's tags to link its internal/external resources like: images, urls, wiki pages, etc. So, to avoid that wiki links/images displays completely broken after they were imported, we added a new `WikiPipeline`, that for now will parse only simple links, and image tags.
##### Before `WikiPipeline`:
##### After `WikiPipeline`:
See merge request !2324
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/gitlab_markdown_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/gitlab_markdown_helper.rb b/app/helpers/gitlab_markdown_helper.rb index ca41657cec1..1a226252251 100644 --- a/app/helpers/gitlab_markdown_helper.rb +++ b/app/helpers/gitlab_markdown_helper.rb @@ -91,7 +91,7 @@ module GitlabMarkdownHelper def render_wiki_content(wiki_page) case wiki_page.format when :markdown - markdown(wiki_page.content) + markdown(wiki_page.content, pipeline: :wiki, project_wiki: @project_wiki) when :asciidoc asciidoc(wiki_page.content) else |