Commit d5779d5d authored by Rémy Coutable's avatar Rémy Coutable

Merge branch '13645-fix-broken-sec-dashboard-help-link' into 'master'

Fix broken link to Security Dashboard help page

See merge request gitlab-org/gitlab-ee!15404
parents eb855325 e3f35023
...@@ -170,7 +170,7 @@ module EE ...@@ -170,7 +170,7 @@ module EE
if pipeline.nil? if pipeline.nil?
{ {
empty_state_illustration_path: image_path('illustrations/security-dashboard_empty.svg'), empty_state_illustration_path: image_path('illustrations/security-dashboard_empty.svg'),
security_dashboard_help_path: help_page_path('user/application_security/security_dashboard'), security_dashboard_help_path: help_page_path('user/application_security/security_dashboard/index'),
has_pipeline_data: "false" has_pipeline_data: "false"
} }
else else
...@@ -181,7 +181,7 @@ module EE ...@@ -181,7 +181,7 @@ module EE
vulnerability_feedback_help_path: help_page_path("user/application_security/index", anchor: "interacting-with-the-vulnerabilities"), vulnerability_feedback_help_path: help_page_path("user/application_security/index", anchor: "interacting-with-the-vulnerabilities"),
empty_state_svg_path: image_path('illustrations/security-dashboard-empty-state.svg'), empty_state_svg_path: image_path('illustrations/security-dashboard-empty-state.svg'),
dashboard_documentation: help_page_path('user/application_security/security_dashboard/index'), dashboard_documentation: help_page_path('user/application_security/security_dashboard/index'),
security_dashboard_help_path: help_page_path('user/application_security/security_dashboard'), security_dashboard_help_path: help_page_path('user/application_security/security_dashboard/index'),
pipeline_id: pipeline.id, pipeline_id: pipeline.id,
user_path: user_url(pipeline.user), user_path: user_url(pipeline.user),
user_avatar_path: pipeline.user.avatar_url, user_avatar_path: pipeline.user.avatar_url,
......
---
title: Fix broken docs link on security dashboard
merge_request: 15404
author:
type: fixed
...@@ -114,7 +114,7 @@ describe ProjectsHelper do ...@@ -114,7 +114,7 @@ describe ProjectsHelper do
subject { helper.project_security_dashboard_config(project, nil) } subject { helper.project_security_dashboard_config(project, nil) }
it 'returns simple config' do it 'returns simple config' do
expect(subject[:security_dashboard_help_path]).to eq '/help/user/application_security/security_dashboard' expect(subject[:security_dashboard_help_path]).to eq '/help/user/application_security/security_dashboard/index'
expect(subject[:has_pipeline_data]).to eq 'false' expect(subject[:has_pipeline_data]).to eq 'false'
end end
end end
...@@ -123,7 +123,7 @@ describe ProjectsHelper do ...@@ -123,7 +123,7 @@ describe ProjectsHelper do
subject { helper.project_security_dashboard_config(project, pipeline) } subject { helper.project_security_dashboard_config(project, pipeline) }
it 'returns config containing pipeline details' do it 'returns config containing pipeline details' do
expect(subject[:security_dashboard_help_path]).to eq '/help/user/application_security/security_dashboard' expect(subject[:security_dashboard_help_path]).to eq '/help/user/application_security/security_dashboard/index'
expect(subject[:has_pipeline_data]).to eq 'true' expect(subject[:has_pipeline_data]).to eq 'true'
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment