Replace existing links to help pages with the new ones.

Marin Jankovski
1 parent a9580a15
Showing 17 changed files with 18 additions and 21 deletions Show diff stats
app/views/admin/groups/show.html.haml
app/views/admin/hooks/index.html.haml
app/views/errors/access_denied.html.haml
app/views/groups/members.html.haml
app/views/profiles/keys/index.html.haml
app/views/profiles/keys/new.html.haml
app/views/projects/deploy_keys/_form.html.haml
app/views/projects/hooks/index.html.haml
app/views/projects/issues/_form.html.haml
app/views/projects/merge_requests/_form.html.haml
app/views/projects/merge_requests/_new_submit.html.haml
app/views/projects/milestones/_form.html.haml
app/views/projects/notes/_form.html.haml
app/views/projects/protected_branches/index.html.haml
app/views/projects/team_members/index.html.haml
app/views/projects/wikis/_form.html.haml
features/steps/help.rb
@@ -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
@@ -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
@@ -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"}
@@ -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
@@ -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
 %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'
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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|
@@ -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"
@@ -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
@@ -8,7 +8,7 @@ class Spinach::Features::Help &lt; 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
	@@ -51,7 +51,7 @@		@@ -51,7 +51,7 @@
51	.body.form-holder	51	.body.form-holder
52	%p.light	52	%p.light
53	Read more about project permissions	53	Read more about project permissions
54	- %strong= link_to "here", help_permissions_path, class: "vlink"	54	+ %strong= link_to "here", help_page_path("permissions", "permissions"), class: "vlink"
55		55
56	= form_tag project_teams_update_admin_group_path(@group), id: "new_team_member", class: "bulk_import", method: :put do	56	= form_tag project_teams_update_admin_group_path(@group), id: "new_team_member", class: "bulk_import", method: :put do
57	%div	57	%div
	@@ -2,7 +2,7 @@		@@ -2,7 +2,7 @@
2	System hooks	2	System hooks
3		3
4	%p.light	4	%p.light
5	- #{link_to "System hooks ", help_system_hooks_path, class: "vlink"} can be	5	+ #{link_to "System hooks ", help_page_path("system_hooks", "system_hooks"), class: "vlink"} can be
6	used for binding events when GitLab creates a User or Project.	6	used for binding events when GitLab creates a User or Project.
7		7
8	%hr	8	%hr
	@@ -2,4 +2,4 @@		@@ -2,4 +2,4 @@
2	%h3.page-title Access Denied	2	%h3.page-title Access Denied
3	%hr	3	%hr
4	%p You are not allowed to access this page.	4	%p You are not allowed to access this page.
5	-%p Read more about project permissions #{link_to "here", help_permissions_path, class: "vlink"}	5	+%p Read more about project permissions #{link_to "here", help_page_path("permissions", "permissions"), class: "vlink"}
	@@ -5,7 +5,7 @@		@@ -5,7 +5,7 @@
5	%p.light	5	%p.light
6	Members of group have access to all group projects.	6	Members of group have access to all group projects.
7	Read more about permissions	7	Read more about permissions
8	- %strong= link_to "here", help_permissions_path, class: "vlink"	8	+ %strong= link_to "here", help_page_path("permissions", "permissions"), class: "vlink"
9		9
10	%hr	10	%hr
11		11
	@@ -6,7 +6,7 @@		@@ -6,7 +6,7 @@
6	SSH keys allow you to establish a secure connection between your computer and GitLab	6	SSH keys allow you to establish a secure connection between your computer and GitLab
7	%br	7	%br
8	Before you can add an SSH key you need to	8	Before you can add an SSH key you need to
9	- = link_to "generate it", help_ssh_path	9	+ = link_to "generate it", help_page_path("ssh", "README")
10	%hr	10	%hr
11		11
12		12
1	%h3.page-title Add an SSH Key	1	%h3.page-title Add an SSH Key
2	%p.light	2	%p.light
3	- Paste your public key here. Read more about how to generate a key on #{link_to "the SSH help page", help_ssh_path}.	3	+ 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")}.
4	%hr	4	%hr
5	= render 'form'	5	= render 'form'
6		6
	@@ -14,7 +14,7 @@		@@ -14,7 +14,7 @@
14	.col-sm-10	14	.col-sm-10
15	%p.light	15	%p.light
16	Paste a machine public key here. Read more about how to generate it	16	Paste a machine public key here. Read more about how to generate it
17	- = link_to "here", help_ssh_path	17	+ = link_to "here", help_page_path("ssh", "README")
18	= f.text_area :key, class: "form-control thin_area", rows: 5	18	= f.text_area :key, class: "form-control thin_area", rows: 5
19		19
20	.form-actions	20	.form-actions
	@@ -2,7 +2,7 @@		@@ -2,7 +2,7 @@
2	Web hooks	2	Web hooks
3		3
4	%p.light	4	%p.light
5	- #{link_to "Web hooks ", help_web_hooks_path, class: "vlink"} can be	5	+ #{link_to "Web hooks ", help_page_path("web_hooks", "web_hooks"), class: "vlink"} can be
6	used for binding events when something is happening within the project.	6	used for binding events when something is happening within the project.
7		7
8	%hr.clearfix	8	%hr.clearfix
	@@ -22,7 +22,7 @@		@@ -22,7 +22,7 @@
22	.col-sm-10	22	.col-sm-10
23	= f.text_area :description, class: 'form-control js-gfm-input markdown-area', rows: 14	23	= f.text_area :description, class: 'form-control js-gfm-input markdown-area', rows: 14
24	.col-sm-12.hint	24	.col-sm-12.hint
25	- .pull-left Issues are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.	25	+ .pull-left Issues are parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"), target: '_blank'}.
26	.pull-right Attach images (JPG, PNG, GIF) by dragging & dropping, #{link_to "selecting them", '#', class: 'markdown-selector' } or pasting from the clipboard.	26	.pull-right Attach images (JPG, PNG, GIF) by dragging & dropping, #{link_to "selecting them", '#', class: 'markdown-selector' } or pasting from the clipboard.
27	.clearfix	27	.clearfix
28	.error-alert	28	.error-alert
	@@ -23,7 +23,7 @@		@@ -23,7 +23,7 @@
23	.col-sm-10	23	.col-sm-10
24	= f.text_area :description, maxlength: 2000, class: "form-control markdown-area", rows: 10	24	= f.text_area :description, maxlength: 2000, class: "form-control markdown-area", rows: 10
25	.hint	25	.hint
26	- .pull-left Milestones are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.	26	+ .pull-left Milestones are parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"), target: '_blank'}.
27	.pull-left Attach images (JPG, PNG, GIF) by dragging & dropping, #{link_to "selecting them", '#', class: 'markdown-selector' } or pasting from the clipboard.	27	.pull-left Attach images (JPG, PNG, GIF) by dragging & dropping, #{link_to "selecting them", '#', class: 'markdown-selector' } or pasting from the clipboard.
28	.clearfix	28	.clearfix
29	.error-alert	29	.error-alert