Commit f79a300417120bb2bdd5d5b22c8ced42e5c3dab7
1 parent
a9580a15
Exists in
spb-stable
and in
2 other branches
Replace existing links to help pages with the new ones.
Showing
17 changed files
with
18 additions
and
21 deletions
Show diff stats
app/views/admin/groups/show.html.haml
| ... | ... | @@ -51,7 +51,7 @@ |
| 51 | 51 | .body.form-holder |
| 52 | 52 | %p.light |
| 53 | 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 | 56 | = form_tag project_teams_update_admin_group_path(@group), id: "new_team_member", class: "bulk_import", method: :put do |
| 57 | 57 | %div | ... | ... |
app/views/admin/hooks/index.html.haml
| ... | ... | @@ -2,7 +2,7 @@ |
| 2 | 2 | System hooks |
| 3 | 3 | |
| 4 | 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 | 6 | used for binding events when GitLab creates a User or Project. |
| 7 | 7 | |
| 8 | 8 | %hr | ... | ... |
app/views/errors/access_denied.html.haml
| ... | ... | @@ -2,4 +2,4 @@ |
| 2 | 2 | %h3.page-title Access Denied |
| 3 | 3 | %hr |
| 4 | 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"} | ... | ... |
app/views/groups/members.html.haml
| ... | ... | @@ -5,7 +5,7 @@ |
| 5 | 5 | %p.light |
| 6 | 6 | Members of group have access to all group projects. |
| 7 | 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 | 10 | %hr |
| 11 | 11 | ... | ... |
app/views/profiles/keys/index.html.haml
| ... | ... | @@ -6,7 +6,7 @@ |
| 6 | 6 | SSH keys allow you to establish a secure connection between your computer and GitLab |
| 7 | 7 | %br |
| 8 | 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 | 10 | %hr |
| 11 | 11 | |
| 12 | 12 | ... | ... |
app/views/profiles/keys/new.html.haml
| 1 | 1 | %h3.page-title Add an SSH Key |
| 2 | 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 | 4 | %hr |
| 5 | 5 | = render 'form' |
| 6 | 6 | ... | ... |
app/views/projects/deploy_keys/_form.html.haml
| ... | ... | @@ -14,7 +14,7 @@ |
| 14 | 14 | .col-sm-10 |
| 15 | 15 | %p.light |
| 16 | 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 | 18 | = f.text_area :key, class: "form-control thin_area", rows: 5 |
| 19 | 19 | |
| 20 | 20 | .form-actions | ... | ... |
app/views/projects/hooks/index.html.haml
| ... | ... | @@ -2,7 +2,7 @@ |
| 2 | 2 | Web hooks |
| 3 | 3 | |
| 4 | 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 | 6 | used for binding events when something is happening within the project. |
| 7 | 7 | |
| 8 | 8 | %hr.clearfix | ... | ... |
app/views/projects/issues/_form.html.haml
| ... | ... | @@ -22,7 +22,7 @@ |
| 22 | 22 | .col-sm-10 |
| 23 | 23 | = f.text_area :description, class: 'form-control js-gfm-input markdown-area', rows: 14 |
| 24 | 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 | 26 | .pull-right Attach images (JPG, PNG, GIF) by dragging & dropping, #{link_to "selecting them", '#', class: 'markdown-selector' } or pasting from the clipboard. |
| 27 | 27 | .clearfix |
| 28 | 28 | .error-alert | ... | ... |
app/views/projects/merge_requests/_form.html.haml
| ... | ... | @@ -24,9 +24,8 @@ |
| 24 | 24 | .col-sm-10 |
| 25 | 25 | = f.text_area :description, class: "form-control js-gfm-input markdown-area", rows: 14 |
| 26 | 26 | .col-sm-12.hint |
| 27 | - .pull-left Description is parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}. | |
| 27 | + .pull-left Description is parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"), target: '_blank'}. | |
| 28 | 28 | .pull-right Attach images (JPG, PNG, GIF) by dragging & dropping, #{link_to "selecting them", '#', class: 'markdown-selector' } or pasting from the clipboard. |
| 29 | - | |
| 30 | 29 | .clearfix |
| 31 | 30 | .error-alert |
| 32 | 31 | %hr | ... | ... |
app/views/projects/merge_requests/_new_submit.html.haml
| ... | ... | @@ -25,9 +25,8 @@ |
| 25 | 25 | = f.label :description, "Description" |
| 26 | 26 | = f.text_area :description, class: "form-control js-gfm-input markdown-area", rows: 10 |
| 27 | 27 | .col-sm-12.hint |
| 28 | - .pull-left Description is parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}. | |
| 28 | + .pull-left Description is parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"), target: '_blank'}. | |
| 29 | 29 | .pull-right Attach images (JPG, PNG, GIF) by dragging & dropping, #{link_to "selecting them", '#', class: 'markdown-selector' } or pasting from the clipboard. |
| 30 | - | |
| 31 | 30 | .clearfix |
| 32 | 31 | .error-alert |
| 33 | 32 | .form-group | ... | ... |
app/views/projects/milestones/_form.html.haml
| ... | ... | @@ -23,7 +23,7 @@ |
| 23 | 23 | .col-sm-10 |
| 24 | 24 | = f.text_area :description, maxlength: 2000, class: "form-control markdown-area", rows: 10 |
| 25 | 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 | 27 | .pull-left Attach images (JPG, PNG, GIF) by dragging & dropping, #{link_to "selecting them", '#', class: 'markdown-selector' } or pasting from the clipboard. |
| 28 | 28 | .clearfix |
| 29 | 29 | .error-alert | ... | ... |
app/views/projects/notes/_form.html.haml
| ... | ... | @@ -17,7 +17,7 @@ |
| 17 | 17 | = f.text_area :note, size: 255, class: 'note_text js-note-text js-gfm-input markdown-area' |
| 18 | 18 | |
| 19 | 19 | .light.clearfix.hint |
| 20 | - .pull-left Comments are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}. | |
| 20 | + .pull-left Comments are parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"), target: '_blank'} | |
| 21 | 21 | .pull-right Attach images (JPG, PNG, GIF) by dragging & dropping, #{link_to "selecting them", '#', class: 'markdown-selector' } or pasting from the clipboard. |
| 22 | 22 | .error-alert |
| 23 | 23 | .note-preview-holder.hide | ... | ... |
app/views/projects/protected_branches/index.html.haml
| ... | ... | @@ -5,10 +5,10 @@ |
| 5 | 5 | .bs-callout.bs-callout-info |
| 6 | 6 | %p Protected branches designed to |
| 7 | 7 | %ul |
| 8 | - %li prevent push for all except #{link_to "masters", help_permissions_path, class: "vlink"}. | |
| 8 | + %li prevent push for all except #{link_to "masters", help_page_path("permissions", "permissions"), class: "vlink"}. | |
| 9 | 9 | %li prevent branch from force push |
| 10 | 10 | %li prevent branch from removal |
| 11 | - %p Read more about project permissions #{link_to "here", help_permissions_path, class: "underlined-link"} | |
| 11 | + %p Read more about project permissions #{link_to "here", help_page_path("permissions", "permissions"), class: "underlined-link"} | |
| 12 | 12 | |
| 13 | 13 | - if can? current_user, :admin_project, @project |
| 14 | 14 | = form_for [@project, @protected_branch], html: { class: 'form-horizontal' } do |f| | ... | ... |
app/views/projects/team_members/index.html.haml
| ... | ... | @@ -10,7 +10,7 @@ |
| 10 | 10 | |
| 11 | 11 | %p.light |
| 12 | 12 | Read more about project permissions |
| 13 | - %strong= link_to "here", help_permissions_path, class: "vlink" | |
| 13 | + %strong= link_to "here", help_page_path("permissions", "permissions"), class: "vlink" | |
| 14 | 14 | = render "team", members: @users_projects |
| 15 | 15 | - if @group |
| 16 | 16 | = render "group_members" | ... | ... |
app/views/projects/wikis/_form.html.haml
| ... | ... | @@ -24,9 +24,8 @@ |
| 24 | 24 | .col-sm-10 |
| 25 | 25 | = f.text_area :content, class: 'form-control js-gfm-input markdown-area', rows: 18 |
| 26 | 26 | .col-sm-12.hint |
| 27 | - .pull-left Wiki content is parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}. | |
| 27 | + .pull-left Wiki content is parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"), target: '_blank'} | |
| 28 | 28 | .pull-right Attach images (JPG, PNG, GIF) by dragging & dropping, #{link_to "selecting them", '#', class: 'markdown-selector' } or pasting from the clipboard. |
| 29 | - | |
| 30 | 29 | .clearfix |
| 31 | 30 | .error-alert |
| 32 | 31 | .form-group | ... | ... |
features/steps/help.rb
| ... | ... | @@ -8,7 +8,7 @@ class Spinach::Features::Help < Spinach::FeatureSteps |
| 8 | 8 | end |
| 9 | 9 | |
| 10 | 10 | step 'I visit the "Rake Tasks" help page' do |
| 11 | - visit help_raketasks_path | |
| 11 | + visit help_page_path("raketasks", "README") | |
| 12 | 12 | end |
| 13 | 13 | |
| 14 | 14 | step 'I should see "Rake Tasks" page markdown rendered' do | ... | ... |