Commit 228386d1 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'cleanup-help' into 'master'

Cleanup help

Remove a lot of unused help files.
Apply `wiki` css to help content
parents 68e4df70 6a7990c0
...@@ -2,17 +2,6 @@ class HelpController < ApplicationController ...@@ -2,17 +2,6 @@ class HelpController < ApplicationController
def index def index
end 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 def show
@category = params[:category] @category = params[:category]
@file = params[:file] @file = params[:file]
......
.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
.row
.col-md-3
%h3.page-title Help
.col-md-9
.wiki
= yield
= 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"))
= 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"))
= render layout: 'help/layout' do
%h3.page-title Permissions
.help_body
= preserve do
= markdown File.read(Rails.root.join("doc", "permissions", "permissions.md"))
= 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"))
= 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 &amp; Restore
.file-content.wiki
= preserve do
= markdown File.read(Rails.root.join("doc", "raketasks", "backup_restore.md"))
= 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"))
.col-md-12 .documentation.wiki
.documentation = markdown File.read(Rails.root.join('doc', @category, @file + '.md'))
= markdown File.read(Rails.root.join('doc', @category, @file + '.md'))
= 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)
= 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"))
= 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"))
= render layout: 'help/layout' do
%h3.page-title Workflow
.help_body
= preserve do
= markdown File.read(Rails.root.join("doc", "workflow", "workflow.md"))
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