Merge branch '7017-remove-unwanted-language' into 'master'

Remove text about whitelisting from container scanning

Closes #7017

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

app/assets/javascripts/reports/components/issues_list.vue

@@ -6,9 +6,6 @@ import {
   STATUS_NEUTRAL,
 } from '~/reports/constants';
 
-import { componentNames } from 'ee/vue_shared/components/reports/issue_body';
-import SastContainerInfo from 'ee/vue_shared/security_reports/components/sast_container_info.vue';
-
 /**
  * Renders block of issues
  */
@@ -16,9 +13,7 @@ import SastContainerInfo from 'ee/vue_shared/security_reports/components/sast_co
 export default {
   components: {
     IssuesBlock,
-    SastContainerInfo,
   },
-  componentNames,
   success: STATUS_SUCCESS,
   failed: STATUS_FAILED,
   neutral: STATUS_NEUTRAL,
@@ -53,7 +48,7 @@ export default {
 </script>
 <template>
   <div class="report-block-container">
-    <sast-container-info v-if="component === $options.componentNames.SastContainerIssueBody" />
+
     <issues-block
       v-if="newIssues.length"
       :component="component"

ee/app/assets/javascripts/vue_shared/security_reports/components/sast_container_info.vue

-<script>
-export default {
-  name: 'SastContainerInfo',
-};
-</script>
-<template>
-  <p
-    class="prepend-top-10 prepend-left-10 report-block-info js-mr-code-quality-info"
-  >
-    {{ s__('ciReport|Unapproved vulnerabilities (red) can be marked as approved.') }}
-    <a
-      href="https://gitlab.com/gitlab-org/clair-scanner#example-whitelist-yaml-file"
-      target="_blank"
-      rel="noopener noreferrer nofollow"
-    >
-      {{ s__('ciReport|Learn more about whitelisting') }}
-    </a>
-  </p>
-</template>

ee/changelogs/unreleased/7017-remove-unwanted-language.yml

+---
+title: remove unnecessary help text from container scanning results
+merge_request: 7304
+author:
+type: removed

locale/gitlab.pot

@@ -8636,9 +8636,6 @@ msgstr ""
 msgid "ciReport|Learn more about interacting with security reports (Alpha)."
 msgstr ""
 
-msgid "ciReport|Learn more about whitelisting"
-msgstr ""
-
 msgid "ciReport|License management detected %d license for the source branch only"
 msgid_plural "ciReport|License management detected %d licenses for the source branch only"
 msgstr[0] ""
@@ -8727,9 +8724,6 @@ msgstr ""
 msgid "ciReport|There was an error reverting the dismissal. Please try again."
 msgstr ""
 
-msgid "ciReport|Unapproved vulnerabilities (red) can be marked as approved."
-msgstr ""
-
 msgid "ciReport|Upgrade %{name} from %{version} to %{fixed}."
 msgstr ""