summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-01-14 15:08:42 +0000
committerDouwe Maan <douwe@gitlab.com>2016-01-14 15:08:42 +0000
commitb6454fef568352b9fffc2c4cb194c98c4af2efa9 (patch)
tree8d3607050daae37156d9f5f6979c7ac15f16fe93 /config
parentb6ae2def2cb2b1da3ddcb3ceee556628a1147cc4 (diff)
parent2450916dc6d8e022ad03350e42d7df1e1711905a (diff)
downloadgitlab-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`: ![Screenshot_2016-01-11_20.14.48](/uploads/46fd5dbb5acfc70aa8ecca3050b675e4/Screenshot_2016-01-11_20.14.48.png) ##### After `WikiPipeline`: ![Screenshot_2016-01-11_20.15.56](/uploads/b1d94aa852f385f867a7868c358b4257/Screenshot_2016-01-11_20.15.56.png) See merge request !2324
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb
index b6cdac63e81..75418db8d25 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -519,7 +519,7 @@ Rails.application.routes.draw do
end
end
- WIKI_SLUG_ID = { id: /[a-zA-Z.0-9_\-\/]+/ } unless defined? WIKI_SLUG_ID
+ WIKI_SLUG_ID = { id: /\S+/ } unless defined? WIKI_SLUG_ID
scope do
# Order matters to give priority to these matches