Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorJob van der Voort <job@gitlab.com>2014-04-18 19:21:21 +0400
committerMarin Jankovski <marin@gitlab.com>2014-05-29 10:44:25 +0400
commitfd476cf62013e49acf23a301b841e7c09197e9ae (patch)
tree78f2d32fc3beb8917c4097e30c1fc17294cb39db /app/views
parente61e3eaadb7f0c7c106b72d1325437e7743a2027 (diff)
render items from doc
Diffstat (limited to 'app/views')
-rw-r--r--app/views/help/_layout.html.haml10
-rw-r--r--app/views/help/index.html.haml2
-rw-r--r--app/views/help/show.html.haml1
3 files changed, 7 insertions, 6 deletions
diff --git a/app/views/help/_layout.html.haml b/app/views/help/_layout.html.haml
index 201d63ca243..72547ed0141 100644
--- a/app/views/help/_layout.html.haml
+++ b/app/views/help/_layout.html.haml
@@ -1,11 +1,11 @@
.row
.col-md-3
%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
+ / %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
.wiki
diff --git a/app/views/help/index.html.haml b/app/views/help/index.html.haml
index 8f0db82d473..ca8e17d1527 100644
--- a/app/views/help/index.html.haml
+++ b/app/views/help/index.html.haml
@@ -38,4 +38,4 @@
.title Documentation
= preserve do
- = markdown File.read(Rails.root.join("doc", "README.md")) \ No newline at end of file
+ = markdown File.read(Rails.root.join("doc", "README.md"))
diff --git a/app/views/help/show.html.haml b/app/views/help/show.html.haml
new file mode 100644
index 00000000000..d7785d307ef
--- /dev/null
+++ b/app/views/help/show.html.haml
@@ -0,0 +1 @@
+= markdown File.read(Rails.root.join('doc', @category, @file + '.md'))