kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'sh-relax-wiki-slug-constraint' into 'master'

Browse source 
Relax constraint on Wiki IDs, since subdirectories can contain spaces

Closes #30357

See merge request !10396
This commit is contained in:
Rémy Coutable 2017-04-03 11:52:33 +00:00
commit e0a9adfbe9
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
changelogs/unreleased/sh-relax-wiki-slug-constraint.yml Normal file
View file

@ -0,0 +1,4 @@
---
title: Relax constraint on Wiki IDs, since subdirectories can contain spaces
merge_request:
author:

4
config/routes/wiki.rb
View file

@ -1,5 +1,3 @@
WIKI_SLUG_ID = { id: /\S+/ }.freeze unless defined? WIKI_SLUG_ID
scope(controller: :wikis) do
scope(path: 'wikis', as: :wikis) do
get :git_access
@ -8,7 +6,7 @@ scope(controller: :wikis) do
post '/', to: 'wikis#create'
end
scope(path: 'wikis/*id', as: :wiki, constraints: WIKI_SLUG_ID, format: false) do
scope(path: 'wikis/*id', as: :wiki, format: false) do
get :edit
get :history
post :preview_markdown