Add latest changes from gitlab-org/gitlab@master

3 files changed, 2 insertions, 26 deletions

diff --git a/app/assets/javascripts/vue_shared/security_reports/queries/security_report_download_paths.query.graphql b/app/assets/javascripts/vue_shared/security_reports/queries/security_report_merge_request_download_paths.query.graphql
index 4ce13827da2..4ce13827da2 100644
--- a/app/assets/javascripts/vue_shared/security_reports/queries/security_report_download_paths.query.graphql
+++ b/app/assets/javascripts/vue_shared/security_reports/queries/security_report_merge_request_download_paths.query.graphql
diff --git a/app/assets/javascripts/vue_shared/security_reports/queries/security_report_mr_download_paths.query.graphql b/app/assets/javascripts/vue_shared/security_reports/queries/security_report_mr_download_paths.query.graphql
deleted file mode 100644
index 4ce13827da2..00000000000
--- a/app/assets/javascripts/vue_shared/security_reports/queries/security_report_mr_download_paths.query.graphql
+++ /dev/null
@@ -1,24 +0,0 @@
-query securityReportDownloadPaths(
-  $projectPath: ID!
-  $iid: String!
-  $reportTypes: [SecurityReportTypeEnum!]
-) {
-  project(fullPath: $projectPath) {
-    mergeRequest(iid: $iid) {
-      headPipeline {
-        id
-        jobs(securityReportTypes: $reportTypes) {
-          nodes {
-            name
-            artifacts {
-              nodes {
-                downloadPath
-                fileType
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/app/assets/javascripts/vue_shared/security_reports/security_reports_app.vue b/app/assets/javascripts/vue_shared/security_reports/security_reports_app.vue
index d10ddd13cad..b7f283b8fd9 100644
--- a/app/assets/javascripts/vue_shared/security_reports/security_reports_app.vue
+++ b/app/assets/javascripts/vue_shared/security_reports/security_reports_app.vue
@@ -13,7 +13,7 @@ import {
   REPORT_TYPE_SECRET_DETECTION,
   reportTypeToSecurityReportTypeEnum,
 } from './constants';
-import securityReportDownloadPathsQuery from './queries/security_report_download_paths.query.graphql';
+import securityReportMergeRequestDownloadPathsQuery from './queries/security_report_merge_request_download_paths.query.graphql';
 import store from './store';
 import { MODULE_SAST, MODULE_SECRET_DETECTION } from './store/constants';
 import { extractSecurityReportArtifactsFromMergeRequest } from './utils';
@@ -86,7 +86,7 @@ export default {
   },
   apollo: {
     reportArtifacts: {
-      query: securityReportDownloadPathsQuery,
+      query: securityReportMergeRequestDownloadPathsQuery,
       variables() {
         return {
           projectPath: this.targetProjectFullPath,