From f79a300417120bb2bdd5d5b22c8ced42e5c3dab7 Mon Sep 17 00:00:00 2001
From: Marin Jankovski <marin@gitlab.com>
Date: Wed, 28 May 2014 15:58:02 +0200
Subject: [PATCH] Replace existing links to help pages with the new ones.

---
 app/views/admin/groups/show.html.haml                   | 2 +-
 app/views/admin/hooks/index.html.haml                   | 2 +-
 app/views/errors/access_denied.html.haml                | 2 +-
 app/views/groups/members.html.haml                      | 2 +-
 app/views/profiles/keys/index.html.haml                 | 2 +-
 app/views/profiles/keys/new.html.haml                   | 2 +-
 app/views/projects/deploy_keys/_form.html.haml          | 2 +-
 app/views/projects/hooks/index.html.haml                | 2 +-
 app/views/projects/issues/_form.html.haml               | 2 +-
 app/views/projects/merge_requests/_form.html.haml       | 3 +--
 app/views/projects/merge_requests/_new_submit.html.haml | 3 +--
 app/views/projects/milestones/_form.html.haml           | 2 +-
 app/views/projects/notes/_form.html.haml                | 2 +-
 app/views/projects/protected_branches/index.html.haml   | 4 ++--
 app/views/projects/team_members/index.html.haml         | 2 +-
 app/views/projects/wikis/_form.html.haml                | 3 +--
 features/steps/help.rb                                  | 2 +-
 17 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml
index 6055865..594762f 100644
--- a/app/views/admin/groups/show.html.haml
+++ b/app/views/admin/groups/show.html.haml
@@ -51,7 +51,7 @@
       .body.form-holder
         %p.light
           Read more about project permissions
-          %strong= link_to "here", help_permissions_path, class: "vlink"
+          %strong= link_to "here", help_page_path("permissions", "permissions"), class: "vlink"
 
         = form_tag project_teams_update_admin_group_path(@group), id: "new_team_member", class: "bulk_import", method: :put  do
           %div
diff --git a/app/views/admin/hooks/index.html.haml b/app/views/admin/hooks/index.html.haml
index 60773c2..b27523c 100644
--- a/app/views/admin/hooks/index.html.haml
+++ b/app/views/admin/hooks/index.html.haml
@@ -2,7 +2,7 @@
   System hooks
 
 %p.light
-  #{link_to "System hooks ", help_system_hooks_path, class: "vlink"} can be
+  #{link_to "System hooks ", help_page_path("system_hooks", "system_hooks"), class: "vlink"} can be
   used for binding events when GitLab creates a User or Project.
 
 %hr
diff --git a/app/views/errors/access_denied.html.haml b/app/views/errors/access_denied.html.haml
index 6aa78f0..e005a7c 100644
--- a/app/views/errors/access_denied.html.haml
+++ b/app/views/errors/access_denied.html.haml
@@ -2,4 +2,4 @@
 %h3.page-title Access Denied
 %hr
 %p You are not allowed to access this page.
-%p Read more about project permissions #{link_to "here", help_permissions_path, class: "vlink"}
+%p Read more about project permissions #{link_to "here", help_page_path("permissions", "permissions"), class: "vlink"}
diff --git a/app/views/groups/members.html.haml b/app/views/groups/members.html.haml
index fa44ee2..cc5eba6 100644
--- a/app/views/groups/members.html.haml
+++ b/app/views/groups/members.html.haml
@@ -5,7 +5,7 @@
   %p.light
     Members of group have access to all group projects.
     Read more about permissions
-    %strong= link_to "here", help_permissions_path, class: "vlink"
+    %strong= link_to "here", help_page_path("permissions", "permissions"), class: "vlink"
 
 %hr
 
diff --git a/app/views/profiles/keys/index.html.haml b/app/views/profiles/keys/index.html.haml
index 71a4ca9..2e10fa8 100644
--- a/app/views/profiles/keys/index.html.haml
+++ b/app/views/profiles/keys/index.html.haml
@@ -6,7 +6,7 @@
   SSH keys allow you to establish a secure connection between your computer and GitLab
   %br
   Before you can add an SSH key you need to
-  = link_to "generate it", help_ssh_path
+  = link_to "generate it", help_page_path("ssh", "README")
 %hr
 
 
diff --git a/app/views/profiles/keys/new.html.haml b/app/views/profiles/keys/new.html.haml
index 3d5a947..126afa5 100644
--- a/app/views/profiles/keys/new.html.haml
+++ b/app/views/profiles/keys/new.html.haml
@@ -1,6 +1,6 @@
 %h3.page-title Add an SSH Key
 %p.light
-  Paste your public key here. Read more about how to generate a key on #{link_to "the SSH help page", help_ssh_path}.
+  Paste your public key here. Read more about how to generate a key on #{link_to "the SSH help page", help_page_path("ssh", "README")}.
 %hr
 = render 'form'
 
diff --git a/app/views/projects/deploy_keys/_form.html.haml b/app/views/projects/deploy_keys/_form.html.haml
index ebb92b3..162ef05 100644
--- a/app/views/projects/deploy_keys/_form.html.haml
+++ b/app/views/projects/deploy_keys/_form.html.haml
@@ -14,7 +14,7 @@
       .col-sm-10
         %p.light
           Paste a machine public key here. Read more about how to generate it
-          = link_to "here", help_ssh_path
+          = link_to "here", help_page_path("ssh", "README")
         = f.text_area :key, class: "form-control thin_area", rows: 5
 
     .form-actions
diff --git a/app/views/projects/hooks/index.html.haml b/app/views/projects/hooks/index.html.haml
index 866fd6f..73171fb 100644
--- a/app/views/projects/hooks/index.html.haml
+++ b/app/views/projects/hooks/index.html.haml
@@ -2,7 +2,7 @@
   Web hooks
 
 %p.light
-  #{link_to "Web hooks ", help_web_hooks_path, class: "vlink"} can be
+  #{link_to "Web hooks ", help_page_path("web_hooks", "web_hooks"), class: "vlink"} can be
   used for binding events when something is happening within the project.
 
 %hr.clearfix
diff --git a/app/views/projects/issues/_form.html.haml b/app/views/projects/issues/_form.html.haml
index 6e61fc8..120d70e 100644
--- a/app/views/projects/issues/_form.html.haml
+++ b/app/views/projects/issues/_form.html.haml
@@ -22,7 +22,7 @@
       .col-sm-10
         = f.text_area :description, class: 'form-control js-gfm-input markdown-area', rows: 14
         .col-sm-12.hint
-          .pull-left Issues are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
+          .pull-left Issues are parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"), target: '_blank'}.
           .pull-right Attach images (JPG, PNG, GIF) by dragging & dropping, #{link_to "selecting them", '#', class: 'markdown-selector' } or pasting from the clipboard.
         .clearfix
         .error-alert
diff --git a/app/views/projects/merge_requests/_form.html.haml b/app/views/projects/merge_requests/_form.html.haml
index facc6a6..27ea53c 100644
--- a/app/views/projects/merge_requests/_form.html.haml
+++ b/app/views/projects/merge_requests/_form.html.haml
@@ -24,9 +24,8 @@
       .col-sm-10
         = f.text_area :description, class: "form-control js-gfm-input markdown-area", rows: 14
         .col-sm-12.hint
-          .pull-left Description is parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
+          .pull-left Description is parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"), target: '_blank'}.
           .pull-right Attach images (JPG, PNG, GIF) by dragging & dropping, #{link_to "selecting them", '#', class: 'markdown-selector' } or pasting from the clipboard.
-
         .clearfix
         .error-alert
     %hr
diff --git a/app/views/projects/merge_requests/_new_submit.html.haml b/app/views/projects/merge_requests/_new_submit.html.haml
index bf0e40f..bdfa444 100644
--- a/app/views/projects/merge_requests/_new_submit.html.haml
+++ b/app/views/projects/merge_requests/_new_submit.html.haml
@@ -25,9 +25,8 @@
           = f.label :description, "Description"
         = f.text_area :description, class: "form-control js-gfm-input markdown-area", rows: 10
         .col-sm-12.hint
-          .pull-left Description is parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
+          .pull-left Description is parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"), target: '_blank'}.
           .pull-right Attach images (JPG, PNG, GIF) by dragging & dropping, #{link_to "selecting them", '#', class: 'markdown-selector' } or pasting from the clipboard.
-
         .clearfix
         .error-alert
       .form-group
diff --git a/app/views/projects/milestones/_form.html.haml b/app/views/projects/milestones/_form.html.haml
index 2233a88..9f3e0c4 100644
--- a/app/views/projects/milestones/_form.html.haml
+++ b/app/views/projects/milestones/_form.html.haml
@@ -23,7 +23,7 @@
         .col-sm-10
           = f.text_area :description, maxlength: 2000, class: "form-control markdown-area", rows: 10
           .hint
-            .pull-left Milestones are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
+            .pull-left Milestones are parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"), target: '_blank'}.
             .pull-left Attach images (JPG, PNG, GIF) by dragging & dropping, #{link_to "selecting them", '#', class: 'markdown-selector' } or pasting from the clipboard.
           .clearfix
           .error-alert
diff --git a/app/views/projects/notes/_form.html.haml b/app/views/projects/notes/_form.html.haml
index 25ebaca..f6a21f7 100644
--- a/app/views/projects/notes/_form.html.haml
+++ b/app/views/projects/notes/_form.html.haml
@@ -17,7 +17,7 @@
       = f.text_area :note, size: 255, class: 'note_text js-note-text js-gfm-input markdown-area'
 
       .light.clearfix.hint
-        .pull-left Comments are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
+        .pull-left Comments are parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"), target: '_blank'}
         .pull-right Attach images (JPG, PNG, GIF) by dragging & dropping, #{link_to "selecting them", '#', class: 'markdown-selector' } or pasting from the clipboard.      
       .error-alert
     .note-preview-holder.hide
diff --git a/app/views/projects/protected_branches/index.html.haml b/app/views/projects/protected_branches/index.html.haml
index e51bf1d..a51a4cc 100644
--- a/app/views/projects/protected_branches/index.html.haml
+++ b/app/views/projects/protected_branches/index.html.haml
@@ -5,10 +5,10 @@
 .bs-callout.bs-callout-info
   %p Protected branches designed to
   %ul
-    %li prevent push for all except #{link_to "masters", help_permissions_path, class: "vlink"}.
+    %li prevent push for all except #{link_to "masters", help_page_path("permissions", "permissions"), class: "vlink"}.
     %li prevent branch from force push
     %li prevent branch from removal
-  %p Read more about project permissions #{link_to "here", help_permissions_path, class: "underlined-link"}
+  %p Read more about project permissions #{link_to "here", help_page_path("permissions", "permissions"), class: "underlined-link"}
 
 - if can? current_user, :admin_project, @project
   = form_for [@project, @protected_branch], html: { class: 'form-horizontal' } do |f|
diff --git a/app/views/projects/team_members/index.html.haml b/app/views/projects/team_members/index.html.haml
index 6eccaaf..ddb3b9d 100644
--- a/app/views/projects/team_members/index.html.haml
+++ b/app/views/projects/team_members/index.html.haml
@@ -10,7 +10,7 @@
 
 %p.light
   Read more about project permissions
-  %strong= link_to "here", help_permissions_path, class: "vlink"
+  %strong= link_to "here", help_page_path("permissions", "permissions"), class: "vlink"
 = render "team", members: @users_projects
 - if @group
   = render "group_members"
diff --git a/app/views/projects/wikis/_form.html.haml b/app/views/projects/wikis/_form.html.haml
index 303cec8..a0a56b8 100644
--- a/app/views/projects/wikis/_form.html.haml
+++ b/app/views/projects/wikis/_form.html.haml
@@ -24,9 +24,8 @@
     .col-sm-10
       = f.text_area :content, class: 'form-control js-gfm-input markdown-area', rows: 18
       .col-sm-12.hint
-        .pull-left Wiki content is parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
+        .pull-left Wiki content is parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"), target: '_blank'}
         .pull-right Attach images (JPG, PNG, GIF) by dragging & dropping, #{link_to "selecting them", '#', class: 'markdown-selector' } or pasting from the clipboard.
-
       .clearfix
       .error-alert
   .form-group
diff --git a/features/steps/help.rb b/features/steps/help.rb
index 5ea2c5d..770acea 100644
--- a/features/steps/help.rb
+++ b/features/steps/help.rb
@@ -8,7 +8,7 @@ class Spinach::Features::Help < Spinach::FeatureSteps
   end
 
   step 'I visit the "Rake Tasks" help page' do
-    visit help_raketasks_path
+    visit help_page_path("raketasks", "README")
   end
 
   step 'I should see "Rake Tasks" page markdown rendered' do
--
libgit2 0.21.2