Merge branch 'docs-correct-security-anchor' into 'master'

Docs: update link to new security docs

See merge request gitlab-org/gitlab-ee!12612

ee/app/helpers/ee/projects_helper.rb

@@ -189,11 +189,11 @@ module EE
           sast_container_head_path: pipeline.downloadable_path_for_report_type(:container_scanning),
           vulnerability_feedback_path: project_vulnerability_feedback_index_path(project),
           pipeline_id: pipeline.id,
-          vulnerability_feedback_help_path: help_page_path("user/project/merge_requests/index", anchor: "interacting-with-security-reports-ultimate"),
-          sast_help_path: help_page_path('user/project/merge_requests/sast'),
-          dependency_scanning_help_path: help_page_path('user/project/merge_requests/dependency_scanning'),
-          dast_help_path: help_page_path('user/project/merge_requests/dast'),
-          sast_container_help_path: help_page_path('user/project/merge_requests/container_scanning'),
+          vulnerability_feedback_help_path: help_page_path('user/application_security/index'),
+          sast_help_path: help_page_path('user/application_security/sast/index'),
+          dependency_scanning_help_path: help_page_path('user/application_security/dependency_scanning/index'),
+          dast_help_path: help_page_path('user/application_security/dast/index'),
+          sast_container_help_path: help_page_path('user/application_security/container_scanning/index'),
           user_path: user_url(pipeline.user),
           user_avatar_path: pipeline.user.avatar_url,
           user_name: pipeline.user.name,

ee/app/views/projects/merge_requests/show.html.haml

@@ -9,9 +9,9 @@
   // Object.assign would be useful here, but it blows up Phantom.js in tests
   window.gl.mrWidgetData.is_geo_secondary_node = '#{Gitlab::Geo.secondary?}' === 'true';
   window.gl.mrWidgetData.geo_secondary_help_path = '#{help_page_path("/gitlab-geo/configuration.md")}';
-  window.gl.mrWidgetData.sast_help_path = '#{help_page_path("user/project/merge_requests/sast")}';
-  window.gl.mrWidgetData.sast_container_help_path = '#{help_page_path("user/project/merge_requests/container_scanning")}';
-  window.gl.mrWidgetData.dast_help_path = '#{help_page_path("user/project/merge_requests/dast")}';
-  window.gl.mrWidgetData.dependency_scanning_help_path = '#{help_page_path("user/project/merge_requests/dependency_scanning")}';
-  window.gl.mrWidgetData.vulnerability_feedback_help_path = '#{help_page_path("user/project/merge_requests/index", anchor: "interacting-with-security-reports-ultimate")}';
+  window.gl.mrWidgetData.sast_help_path = '#{help_page_path("user/application_security/sast/index")}';
+  window.gl.mrWidgetData.sast_container_help_path = '#{help_page_path("user/application_security/container_scanning/index")}';
+  window.gl.mrWidgetData.dast_help_path = '#{help_page_path("user/application_security/dast/index")}';
+  window.gl.mrWidgetData.dependency_scanning_help_path = '#{help_page_path("user/application_security/dependency_scanning/index")}';
+  window.gl.mrWidgetData.vulnerability_feedback_help_path = '#{help_page_path("user/application_security/index")}';
   window.gl.mrWidgetData.approvals_help_path = '#{help_page_path("user/project/merge_requests/merge_request_approvals")}';

ee/app/views/projects/pipelines/_tabs_content.html.haml

@@ -18,11 +18,11 @@
     pipeline_id: pipeline.id,
     source_branch: pipeline.ref,
     vulnerability_feedback_path: project_vulnerability_feedback_index_path(project),
-    vulnerability_feedback_help_path: help_page_path("user/project/merge_requests/index", anchor: "interacting-with-security-reports-ultimate"),
-    sast_help_path: help_page_path('user/project/merge_requests/sast'),
-    dependency_scanning_help_path: help_page_path('user/project/merge_requests/dependency_scanning'),
-    dast_help_path: help_page_path('user/project/merge_requests/dast'),
-    sast_container_help_path: help_page_path('user/project/merge_requests/container_scanning'),
+    vulnerability_feedback_help_path: help_page_path('user/application_security/index'),
+    sast_help_path: help_page_path('user/application_security/sast/index'),
+    dependency_scanning_help_path: help_page_path('user/application_security/dependency_scanning/index'),
+    dast_help_path: help_page_path('user/application_security/dast/index'),
+    sast_container_help_path: help_page_path('user/application_security/container_scanning/index'),
     create_vulnerability_feedback_issue_path: create_vulnerability_feedback_issue_path(project),
     create_vulnerability_feedback_merge_request_path: create_vulnerability_feedback_merge_request_path(project),
     create_vulnerability_feedback_dismissal_path: create_vulnerability_feedback_dismissal_path(project) } }

ee/spec/javascripts/vue_mr_widget/mock_data.js

@@ -9,8 +9,7 @@ export default Object.assign({}, mockData, {
     base_path: 'blob_path',
     head_path: 'blob_path',
   },
-  vulnerability_feedback_help_path:
-    '/help/user/project/merge_requests/index#interacting-with-security-reports-ultimate',
+  vulnerability_feedback_help_path: '/help/user/application_security/index',
 });
 
 // Codeclimate