diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-04-15 13:15:18 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-04-15 13:15:18 -0400 |
| commit | 2d4ffce826ef86af6bc69385ded6830297a8467f (patch) | |
| tree | ecf5e12e2eaaaf4b8afc9f4569ce76a7ecd6523a | |
| parent | 3052e894207303bf9fed972aa60d3a655a6c58d9 (diff) | |
| download | gitlab-ce-2d4ffce826ef86af6bc69385ded6830297a8467f.tar.gz | |
Loosen help page parameter constraints for category
| -rw-r--r-- | app/controllers/help_controller.rb | 2 | ||||
| -rw-r--r-- | config/routes.rb | 2 | ||||
| -rw-r--r-- | spec/routing/routing_spec.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb index 10094d86dfb..35ece5b270b 100644 --- a/app/controllers/help_controller.rb +++ b/app/controllers/help_controller.rb @@ -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 diff --git a/config/routes.rb b/config/routes.rb index 8dbe6d80ab7..744a99feded 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -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' diff --git a/spec/routing/routing_spec.rb b/spec/routing/routing_spec.rb index b1225f101b7..e219a57c29e 100644 --- a/spec/routing/routing_spec.rb +++ b/spec/routing/routing_spec.rb @@ -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 |