Merge branch '210327-rename-filter-to-scanner' into 'master'

Update pipeline security tab filter label and docs

See merge request gitlab-org/gitlab!35893

ee/app/assets/javascripts/security_dashboard/store/modules/filters/constants.js

@@ -8,7 +8,7 @@ export const BASE_FILTERS = {
     id: ALL,
   },
   report_type: {
-    name: s__('ciReport|All scanner types'),
+    name: s__('ciReport|All scanners'),
     id: ALL,
   },
   project_id: {

ee/app/assets/javascripts/security_dashboard/store/modules/filters/state.js

@@ -14,7 +14,7 @@ export default () => ({
       selection: new Set([BASE_FILTERS.severity.id]),
     },
     {
-      name: s__('SecurityReports|Scanner type'),
+      name: s__('SecurityReports|Scanner'),
       id: 'report_type',
       options: [BASE_FILTERS.report_type, ...optionsObjectToArray(REPORT_TYPES)],
       hidden: false,

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

@@ -210,10 +210,7 @@ export default {
       <severity-badge :severity="vulnerability.severity" class="d-inline" />
     </vulnerability-detail>
 
-    <vulnerability-detail
-      v-if="vulnerability.report_type"
-      :label="s__('Vulnerability|Scanner Type')"
-    >
+    <vulnerability-detail v-if="vulnerability.report_type" :label="s__('Vulnerability|Scanner')">
       <gl-friendly-wrap :text="scannerType" />
     </vulnerability-detail>
 

ee/changelogs/unreleased/210327-rename-filter-to-scanner.yml

+---
+title: Update pipeline security tab filter label and docs
+merge_request: 35893
+author:
+type: changed

ee/spec/frontend/vue_shared/security_reports/components/__snapshots__/vulnerability_details_spec.js.snap

@@ -144,7 +144,7 @@ key2: value2"
   </vulnerability-detail-stub>
    
   <vulnerability-detail-stub
-    label="Scanner Type"
+    label="Scanner"
   >
     <gl-friendly-wrap-stub
       symbols="/"

locale/gitlab.pot

@@ -20264,7 +20264,7 @@ msgstr ""
 msgid "SecurityReports|Scan details"
 msgstr ""
 
-msgid "SecurityReports|Scanner type"
+msgid "SecurityReports|Scanner"
 msgstr ""
 
 msgid "SecurityReports|Security Dashboard"
@@ -25626,10 +25626,10 @@ msgstr ""
 msgid "Vulnerability|Project"
 msgstr ""
 
-msgid "Vulnerability|Scanner Provider"
+msgid "Vulnerability|Scanner"
 msgstr ""
 
-msgid "Vulnerability|Scanner Type"
+msgid "Vulnerability|Scanner Provider"
 msgstr ""
 
 msgid "Vulnerability|Severity"
@@ -26860,7 +26860,7 @@ msgstr ""
 msgid "ciReport|All projects"
 msgstr ""
 
-msgid "ciReport|All scanner types"
+msgid "ciReport|All scanners"
 msgstr ""
 
 msgid "ciReport|All severities"