Merge branch 'cleanup-help' into 'master'

app/controllers/help_controller.rb

@@ -2,17 +2,6 @@ class HelpController < ApplicationController
   def index
   end
 
-  def api
-    @category = params[:category]
-    @category = "README" if @category.blank?
-
-    if File.exists?(Rails.root.join('doc', 'api', @category + '.md'))
-      render 'api'
-    else
-      not_found!
-    end
-  end
-
   def show
     @category = params[:category]
     @file = params[:file]

app/views/help/_api_layout.html.haml

-.row
-  .col-md-3
-    .append-bottom-20
-      = link_to help_path, class: 'btn btn-small' do
-        %i.icon-angle-left
-        Back to help
-    %ul.nav.nav-pills.nav-stacked
-      - %w(README projects project_snippets repositories repository_files commits deploy_keys users groups session issues milestones merge_requests notes system_hooks).each do |file|
-        %li{class: file == @category ? 'active' : nil}
-          = link_to file.titleize, help_api_file_path(file)
-
-  .col-md-9.pull-right
-    = yield

app/views/help/_layout.html.haml

-.row
-  .col-md-3
-    %h3.page-title Help
-  .col-md-9
-    .wiki
-      = yield

app/views/help/api.html.haml

-= render layout: 'help/api_layout' do
-  %h3.page-title
-    %span.light API
-    %span
-      \/
-    = @category.titleize
-
-  .file-holder
-    .file-title
-      %i.icon-file
-      = @category
-    .file-content.wiki
-      = preserve do
-        = markdown File.read(Rails.root.join("doc", "api", "#{@category}.md"))

app/views/help/markdown.html.haml

-= render layout: 'help/layout' do
-  %h3.page-title GitLab Flavored Markdown
-
-  .help_body
-    = preserve do
-      = markdown File.read(Rails.root.join("doc", "markdown", "markdown.md"))

app/views/help/permissions.html.haml

-= render layout: 'help/layout' do
-  %h3.page-title Permissions 
-
-  .help_body
-    = preserve do
-      = markdown File.read(Rails.root.join("doc", "permissions", "permissions.md"))

app/views/help/public_access.html.haml

-= render layout: 'help/layout' do
-  %h3.page-title Public Access 
-
-  .help_body
-    = preserve do
-      = markdown File.read(Rails.root.join("doc", "public_access", "public_access.md"))

app/views/help/raketasks.html.haml

-= render layout: 'help/layout' do
-  %h3.page-title GitLab Rake Tasks
-
-  %p.slead
-    GitLab provides some specific rake tasks to enable special features or perform maintenance tasks.
-
-  %ul.nav.nav-tabs.log-tabs
-    %li.active
-      = link_to "Maintenance", "#maintenance", 'data-toggle' => 'tab'
-    %li
-      = link_to "User Management", "#user_management", 'data-toggle' => 'tab'
-    %li
-      = link_to "Backup & Restore", "#backup_restore", 'data-toggle' => 'tab'
-    %li
-      = link_to "Cleanup", "#cleanup", 'data-toggle' => 'tab'
-
-  .tab-content
-    .tab-pane.active#maintenance
-      .file-holder
-        .file-title
-          %i.icon-file
-          Maintenance
-        .file-content.wiki
-          = preserve do
-            = markdown File.read(Rails.root.join("doc", "raketasks", "maintenance.md"))
-
-    .tab-pane#user_management
-      .file-holder
-        .file-title
-          %i.icon-file
-          User Management
-        .file-content.wiki
-          = preserve do
-            = markdown File.read(Rails.root.join("doc", "raketasks", "user_management.md"))
-
-    .tab-pane#cleanup
-      .file-holder
-        .file-title
-          %i.icon-file
-          Cleanup
-        .file-content.wiki
-          = preserve do
-            = markdown File.read(Rails.root.join("doc", "raketasks", "cleanup.md"))
-
-    .tab-pane#backup_restore
-      .file-holder
-        .file-title
-          %i.icon-file
-          Backup & Restore
-        .file-content.wiki
-          = preserve do
-            = markdown File.read(Rails.root.join("doc", "raketasks", "backup_restore.md"))

app/views/help/security.html.haml

-= render layout: 'help/layout' do
-  %h3.page-title Security
-
-  %p.slead
-    If your GitLab instance is visible from the internet chances are it will be 'tested' by bots sooner or later.
-    %br
-    %br
-    %br
-    .file-holder
-      .file-title
-        %i.icon-file
-        Dealing with bruteforcing
-      .file-content.wiki
-        = preserve do
-          = markdown File.read(Rails.root.join("doc", "security", "rack_attack.md"))

app/views/help/show.html.haml

-.col-md-12
-  .documentation
-    = markdown File.read(Rails.root.join('doc', @category, @file + '.md'))
+.documentation.wiki
+  = markdown File.read(Rails.root.join('doc', @category, @file + '.md'))

app/views/help/ssh.html.haml

-= render layout: 'help/layout' do
-  %h3.page-title SSH Keys 
-
-  .help_body
-    = preserve do
-      = markdown File.read(Rails.root.join("doc", "ssh", "ssh.md")).gsub("$your_email", current_user.email)

app/views/help/system_hooks.html.haml

-= render layout: 'help/layout' do
-  %h3.page-title System hooks 
-
-  .help_body
-    = preserve do
-      = markdown File.read(Rails.root.join("doc", "system_hooks", "system_hooks.md"))

app/views/help/web_hooks.html.haml

-= render layout: 'help/layout' do
-  %h3.page-title Project web hooks 
-
-  .help_body
-    = preserve do
-      = markdown File.read(Rails.root.join("doc", "web_hooks", "web_hooks.md"))

app/views/help/workflow.html.haml

-= render layout: 'help/layout' do
-  %h3.page-title Workflow 
-
-  .help_body
-    = preserve do
-      = markdown File.read(Rails.root.join("doc", "workflow", "workflow.md"))