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/views | |
| 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/views')
| -rw-r--r-- | app/views/projects/wikis/_new.html.haml | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/app/views/projects/wikis/_new.html.haml b/app/views/projects/wikis/_new.html.haml index f0547e9c057..53b37b1104e 100644 --- a/app/views/projects/wikis/_new.html.haml +++ b/app/views/projects/wikis/_new.html.haml @@ -5,12 +5,9 @@ %a.close{href: "#", "data-dismiss" => "modal"} × %h3.page-title New Wiki Page .modal-body - = label_tag :new_wiki_path do - %span Page slug - = text_field_tag :new_wiki_path, nil, placeholder: 'how-to-setup', class: 'form-control', required: true, :'data-wikis-path' => namespace_project_wikis_path(@project.namespace, @project) - %p.hidden.text-danger{data: { error: "slug" }} - The page slug is invalid. Please don't use characters other then: a-z 0-9 _ - and / - %p.hint - Please don't use spaces. + .form-group + = label_tag :new_wiki_path do + %span Page slug + = text_field_tag :new_wiki_path, nil, placeholder: 'how-to-setup', class: 'form-control', required: true, :'data-wikis-path' => namespace_project_wikis_path(@project.namespace, @project) .form-actions = link_to 'Create Page', '#', class: 'build-new-wiki btn btn-create' |