summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorConnor Shea <connor.james.shea@gmail.com>2016-07-19 11:17:14 -0600
committerConnor Shea <connor.james.shea@gmail.com>2016-07-19 11:17:14 -0600
commit16a8160e9f1cc2874a39dfd2d6a6abea9bcfead5 (patch)
treeec308b39932cfaf6bee3c61b0a6cb4ba61833c42 /config
parent81e57e783e8882de21d27d9191c09404ed7faca3 (diff)
downloadgitlab-ce-16a8160e9f1cc2874a39dfd2d6a6abea9bcfead5.tar.gz
Fix help page paths to make sure shortcuts and the UI help page work.fix-help-paths
Add a test to make sure the help page UI path doesn't break in the future. Fix #19972 and #19889.
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb9
1 files changed, 4 insertions, 5 deletions
diff --git a/config/routes.rb b/config/routes.rb
index be651d8903f..2a9fe30b0e6 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -89,11 +89,10 @@ Rails.application.routes.draw do
mount Grack::AuthSpawner, at: '/', constraints: lambda { |request| /[-\/\w\.]+\.git\/(info\/lfs|gitlab-lfs)/.match(request.path_info) }, via: [:get, :post, :put]
# Help
-
- get 'help' => 'help#index'
- get 'help/*path' => 'help#show', as: :help_page
- get 'help/shortcuts'
- get 'help/ui' => 'help#ui'
+ get 'help' => 'help#index'
+ get 'help/shortcuts' => 'help#shortcuts'
+ get 'help/ui' => 'help#ui'
+ get 'help/*path' => 'help#show', as: :help_page
#
# Global snippets