Commit e0a9adfb authored by Rémy Coutable's avatar Rémy Coutable

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

Relax constraint on Wiki IDs, since subdirectories can contain spaces

Closes #30357

See merge request !10396
parents 3ed43ab8 6811adaf
---
title: Relax constraint on Wiki IDs, since subdirectories can contain spaces
merge_request:
author:
WIKI_SLUG_ID = { id: /\S+/ }.freeze unless defined? WIKI_SLUG_ID
scope(controller: :wikis) do scope(controller: :wikis) do
scope(path: 'wikis', as: :wikis) do scope(path: 'wikis', as: :wikis) do
get :git_access get :git_access
...@@ -8,7 +6,7 @@ scope(controller: :wikis) do ...@@ -8,7 +6,7 @@ scope(controller: :wikis) do
post '/', to: 'wikis#create' post '/', to: 'wikis#create'
end 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 :edit
get :history get :history
post :preview_markdown post :preview_markdown
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment