summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorconnorshea <connor.james.shea@gmail.com>2016-04-05 21:54:57 -0600
committerConnor Shea <connor.james.shea@gmail.com>2016-07-11 12:48:38 -0600
commit61f0e89484be5aca5d22ab63c72b08575f7e3f6d (patch)
treecc95be25ec217ca105063cfe3784b33ad935a0e5
parent734e44ee79590be6d9f01ca3e815304221a5c88d (diff)
downloadgitlab-ce-61f0e89484be5aca5d22ab63c72b08575f7e3f6d.tar.gz
Make "Get started with Builds" Help Page link work properly
This is probably a horrible way of fixing this issue, but it does work. I can’t find much information on linking this deeply with Rails routes. Resolves #14872.
-rw-r--r--app/views/projects/_builds_settings.html.haml2
-rw-r--r--config/routes.rb1
2 files changed, 2 insertions, 1 deletions
diff --git a/app/views/projects/_builds_settings.html.haml b/app/views/projects/_builds_settings.html.haml
index 0568c2d305e..d411da85ab0 100644
--- a/app/views/projects/_builds_settings.html.haml
+++ b/app/views/projects/_builds_settings.html.haml
@@ -4,7 +4,7 @@
- unless @repository.gitlab_ci_yml
.form-group
%p Builds need to be configured before you can begin using Continuous Integration.
- = link_to 'Get started with Builds', help_page_path('ci/quick_start', 'README'), class: 'btn btn-info'
+ = link_to 'Get started with Builds', help_page_path('ci', 'quick_start', 'README'), class: 'btn btn-info'
.form-group
%p Get recent application code using the following command:
.radio
diff --git a/config/routes.rb b/config/routes.rb
index b4f83c58bbd..5ee0bd422fa 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -91,6 +91,7 @@ Rails.application.routes.draw do
# Help
get 'help' => 'help#index'
get 'help/:category/:file' => 'help#show', as: :help_page, constraints: { category: /.*/, file: /[^\/\.]+/ }
+ get 'help/:category/:subcategory/:file' => 'help#show', as: :deep_help_page, constraints: { category: /.*/, subcategory: /.*/, file: /[^\/\.]+/ }
get 'help/shortcuts'
get 'help/ui' => 'help#ui'