diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-14 15:51:07 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-14 15:51:07 +0300 |
commit | 6a7990c007f2349f3093aef3e70eaa8c092033c8 (patch) | |
tree | 56987c18f348121d0d4073438f97a1181aaff46b | |
parent | 68e4df7065ebb805d8215b8c28f0eaf510dec17f (diff) | |
download | gitlab-ce-6a7990c007f2349f3093aef3e70eaa8c092033c8.tar.gz |
Remove garbage and apply wiki style
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r-- | app/controllers/help_controller.rb | 11 | ||||
-rw-r--r-- | app/views/help/_api_layout.html.haml | 13 | ||||
-rw-r--r-- | app/views/help/_layout.html.haml | 6 | ||||
-rw-r--r-- | app/views/help/api.html.haml | 14 | ||||
-rw-r--r-- | app/views/help/markdown.html.haml | 6 | ||||
-rw-r--r-- | app/views/help/permissions.html.haml | 6 | ||||
-rw-r--r-- | app/views/help/public_access.html.haml | 6 | ||||
-rw-r--r-- | app/views/help/raketasks.html.haml | 52 | ||||
-rw-r--r-- | app/views/help/security.html.haml | 15 | ||||
-rw-r--r-- | app/views/help/show.html.haml | 5 | ||||
-rw-r--r-- | app/views/help/ssh.html.haml | 6 | ||||
-rw-r--r-- | app/views/help/system_hooks.html.haml | 6 | ||||
-rw-r--r-- | app/views/help/web_hooks.html.haml | 6 | ||||
-rw-r--r-- | app/views/help/workflow.html.haml | 6 |
14 files changed, 2 insertions, 156 deletions
diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb index a4fcd4b29e8..fc498559d6b 100644 --- a/app/controllers/help_controller.rb +++ b/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] diff --git a/app/views/help/_api_layout.html.haml b/app/views/help/_api_layout.html.haml deleted file mode 100644 index af723f906d9..00000000000 --- a/app/views/help/_api_layout.html.haml +++ /dev/null @@ -1,13 +0,0 @@ -.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 diff --git a/app/views/help/_layout.html.haml b/app/views/help/_layout.html.haml deleted file mode 100644 index 93a746c60ea..00000000000 --- a/app/views/help/_layout.html.haml +++ /dev/null @@ -1,6 +0,0 @@ -.row - .col-md-3 - %h3.page-title Help - .col-md-9 - .wiki - = yield diff --git a/app/views/help/api.html.haml b/app/views/help/api.html.haml deleted file mode 100644 index 3d2cf50b7f2..00000000000 --- a/app/views/help/api.html.haml +++ /dev/null @@ -1,14 +0,0 @@ -= 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")) diff --git a/app/views/help/markdown.html.haml b/app/views/help/markdown.html.haml deleted file mode 100644 index ec9d13f2d6b..00000000000 --- a/app/views/help/markdown.html.haml +++ /dev/null @@ -1,6 +0,0 @@ -= 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")) diff --git a/app/views/help/permissions.html.haml b/app/views/help/permissions.html.haml deleted file mode 100644 index 5d3ee4526fe..00000000000 --- a/app/views/help/permissions.html.haml +++ /dev/null @@ -1,6 +0,0 @@ -= render layout: 'help/layout' do - %h3.page-title Permissions - - .help_body - = preserve do - = markdown File.read(Rails.root.join("doc", "permissions", "permissions.md")) diff --git a/app/views/help/public_access.html.haml b/app/views/help/public_access.html.haml deleted file mode 100644 index d1ec3f5d5c1..00000000000 --- a/app/views/help/public_access.html.haml +++ /dev/null @@ -1,6 +0,0 @@ -= 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")) diff --git a/app/views/help/raketasks.html.haml b/app/views/help/raketasks.html.haml deleted file mode 100644 index 61a3774a132..00000000000 --- a/app/views/help/raketasks.html.haml +++ /dev/null @@ -1,52 +0,0 @@ -= 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")) diff --git a/app/views/help/security.html.haml b/app/views/help/security.html.haml deleted file mode 100644 index 72f21e9f634..00000000000 --- a/app/views/help/security.html.haml +++ /dev/null @@ -1,15 +0,0 @@ -= 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")) diff --git a/app/views/help/show.html.haml b/app/views/help/show.html.haml index e9fc6163c79..67f9cc41cf3 100644 --- a/app/views/help/show.html.haml +++ b/app/views/help/show.html.haml @@ -1,3 +1,2 @@ -.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')) diff --git a/app/views/help/ssh.html.haml b/app/views/help/ssh.html.haml deleted file mode 100644 index 75419c3dd01..00000000000 --- a/app/views/help/ssh.html.haml +++ /dev/null @@ -1,6 +0,0 @@ -= 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) diff --git a/app/views/help/system_hooks.html.haml b/app/views/help/system_hooks.html.haml deleted file mode 100644 index e24f566121d..00000000000 --- a/app/views/help/system_hooks.html.haml +++ /dev/null @@ -1,6 +0,0 @@ -= 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")) diff --git a/app/views/help/web_hooks.html.haml b/app/views/help/web_hooks.html.haml deleted file mode 100644 index 9e2b54ab6ec..00000000000 --- a/app/views/help/web_hooks.html.haml +++ /dev/null @@ -1,6 +0,0 @@ -= 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")) diff --git a/app/views/help/workflow.html.haml b/app/views/help/workflow.html.haml deleted file mode 100644 index 47de4ad796c..00000000000 --- a/app/views/help/workflow.html.haml +++ /dev/null @@ -1,6 +0,0 @@ -= render layout: 'help/layout' do - %h3.page-title Workflow - - .help_body - = preserve do - = markdown File.read(Rails.root.join("doc", "workflow", "workflow.md")) |