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

Loosen help page parameter constraints for category

This commit is contained in:
Robert Speicher 2015-04-15 13:15:18 -04:00
parent 3052e89420
commit 2d4ffce826
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/help_controller.rb
View File

@ -4,7 +4,7 @@ class HelpController < ApplicationController
def show
category = clean_path_info(path_params[:category])
file = clean_path_info(path_params[:file])
file = path_params[:file]
respond_to do |format|
format.any(:markdown, :md, :html) do

2
config/routes.rb
View File

@ -39,7 +39,7 @@ Gitlab::Application.routes.draw do
# Help
get 'help' => 'help#index'
get 'help/:category/:file' => 'help#show', as: :help_page, constraints: { category: /[^\.]+/, file: /[^\.]+/ }
get 'help/:category/:file' => 'help#show', as: :help_page, constraints: { category: /.*/, file: /[^\/\.]+/ }
get 'help/shortcuts'
get 'help/ui' => 'help#ui'

2
spec/routing/routing_spec.rb
View File

@ -65,7 +65,7 @@ describe SnippetsController, "routing" do
end
# help GET /help(.:format) help#index
# help_page GET /help/:category/:file(.:format) help#show {:category=>/[^\.]+/, :file=>/[^\.]+/}
# help_page GET /help/:category/:file(.:format) help#show {:category=>/.*/, :file=>/[^\/\.]+/}
# help_shortcuts GET /help/shortcuts(.:format) help#shortcuts
# help_ui GET /help/ui(.:format) help#ui
describe HelpController, "routing" do