Commit a9580a15 authored by Marin Jankovski's avatar Marin Jankovski

Use the correct links, replace in search.

parent 59797b2f
...@@ -33,15 +33,15 @@ module SearchHelper ...@@ -33,15 +33,15 @@ module SearchHelper
# Autocomplete results for internal help pages # Autocomplete results for internal help pages
def help_autocomplete def help_autocomplete
[ [
{ label: "help: API Help", url: help_api_path }, { label: "help: API Help", url: help_page_path("api", "README") },
{ label: "help: Markdown Help", url: help_markdown_path }, { label: "help: Markdown Help", url: help_page_path("markdown", "markdown") },
{ label: "help: Permissions Help", url: help_permissions_path }, { label: "help: Permissions Help", url: help_page_path("permissions", "permissions") },
{ label: "help: Public Access Help", url: help_public_access_path }, { label: "help: Public Access Help", url: help_page_path("public_access", "public_access") },
{ label: "help: Rake Tasks Help", url: help_raketasks_path }, { label: "help: Rake Tasks Help", url: help_page_path("raketasks", "README") },
{ label: "help: SSH Keys Help", url: help_ssh_path }, { label: "help: SSH Keys Help", url: help_page_path("ssh", "README") },
{ label: "help: System Hooks Help", url: help_system_hooks_path }, { label: "help: System Hooks Help", url: help_page_path("system_hooks", "system_hooks") },
{ label: "help: Web Hooks Help", url: help_web_hooks_path }, { label: "help: Web Hooks Help", url: help_page_path("web_hooks", "web_hooks") },
{ label: "help: Workflow Help", url: help_workflow_path }, { label: "help: Workflow Help", url: help_page_path("workflow", "README") },
] ]
end end
......
.row .row
.col-md-3 .col-md-3
%h3.page-title Help %h3.page-title Help
/ %ul.nav.nav-pills.nav-stacked
/ - links = {:"Workflow" => help_workflow_path, :"SSH Keys" => help_ssh_path, :"GitLab Markdown" => help_markdown_path, :"Permissions" => help_permissions_path, :"API" => help_api_path, :"Web Hooks" => help_web_hooks_path, :"Rake Tasks" => help_raketasks_path, :"System Hooks" => help_system_hooks_path, :"Public Access" => help_public_access_path, :"Security" => help_security_path}
/ - links.each do |title,path|
/ %li{class: current_page?(path) ? 'active' : nil}
/ = link_to title, path
.col-md-9 .col-md-9
.wiki .wiki
= yield = yield
.form-group.project-visibility-level-holder .form-group.project-visibility-level-holder
= f.label :visibility_level, class: 'control-label' do = f.label :visibility_level, class: 'control-label' do
Visibility Level Visibility Level
= link_to "(?)", help_public_access_path = link_to "(?)", help_page_path("public_access", "public_access")
.col-sm-10 .col-sm-10
- if can_change_visibility_level - if can_change_visibility_level
- Gitlab::VisibilityLevel.values.each do |level| - Gitlab::VisibilityLevel.values.each do |level|
......
...@@ -33,7 +33,7 @@ Gitlab::Application.routes.draw do ...@@ -33,7 +33,7 @@ Gitlab::Application.routes.draw do
# #
get 'help' => 'help#index' get 'help' => 'help#index'
get 'help/:category/:file' => 'help#show' get 'help/:category/:file' => 'help#show', as: :help_page
# #
# Global snippets # Global snippets
......
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