Merge branch 'jnnkl-sec-config-upgrade-redesign' into 'master'

Change Banner Copy on Security-Configuration Page

See merge request gitlab-org/gitlab!66533

app/assets/javascripts/security_configuration/components/upgrade_banner.vue

@@ -8,20 +8,18 @@ export default {
   },
   inject: ['upgradePath'],
   i18n: {
-    title: s__('SecurityConfiguration|Secure your project with Ultimate'),
+    title: s__('SecurityConfiguration|Secure your project'),
     bodyStart: s__(
-      `SecurityConfiguration|GitLab Ultimate checks your application for security vulnerabilities
-      that may lead to unauthorized access, data leaks, and denial of service
-      attacks. Its features include:`,
+      `SecurityConfiguration|Immediately begin risk analysis and remediation with application security features. Start with SAST and Secret Detection, available to all plans. Upgrade to Ultimate to get all features, including:`,
     ),
     bodyListItems: [
-      s__('SecurityConfiguration|Vulnerability details and statistics in the merge request.'),
-      s__('SecurityConfiguration|High-level vulnerability statistics across projects and groups.'),
-      s__('SecurityConfiguration|Runtime security metrics for application environments.'),
+      s__('SecurityConfiguration|Vulnerability details and statistics in the merge request'),
+      s__('SecurityConfiguration|High-level vulnerability statistics across projects and groups'),
+      s__('SecurityConfiguration|Runtime security metrics for application environments'),
+      s__(
+        'SecurityConfiguration|More scan types, including Container Scanning, DAST, Dependency Scanning, Fuzzing, and Licence Compliance',
+      ),
     ],
-    bodyEnd: s__(
-      'SecurityConfiguration|With the information provided, you can immediately begin risk analysis and remediation within GitLab.',
-    ),
     buttonText: s__('SecurityConfiguration|Upgrade or start a free trial'),
   },
 };
@@ -32,14 +30,14 @@ export default {
     :title="$options.i18n.title"
     :button-text="$options.i18n.buttonText"
     :button-link="upgradePath"
+    variant="introduction"
     v-on="$listeners"
   >
     <p>{{ $options.i18n.bodyStart }}</p>
-    <ul>
+    <ul class="gl-pl-6">
       <li v-for="bodyListItem in $options.i18n.bodyListItems" :key="bodyListItem">
         {{ bodyListItem }}
       </li>
     </ul>
-    <p>{{ $options.i18n.bodyEnd }}</p>
   </gl-banner>
 </template>

locale/gitlab.pot

@@ -28964,10 +28964,10 @@ msgstr ""
 msgid "SecurityConfiguration|Feature documentation for %{featureName}"
 msgstr ""
 
-msgid "SecurityConfiguration|GitLab Ultimate checks your application for security vulnerabilities that may lead to unauthorized access, data leaks, and denial of service attacks. Its features include:"
+msgid "SecurityConfiguration|High-level vulnerability statistics across projects and groups"
 msgstr ""
 
-msgid "SecurityConfiguration|High-level vulnerability statistics across projects and groups."
+msgid "SecurityConfiguration|Immediately begin risk analysis and remediation with application security features. Start with SAST and Secret Detection, available to all plans. Upgrade to Ultimate to get all features, including:"
 msgstr ""
 
 msgid "SecurityConfiguration|Manage"
@@ -28982,6 +28982,9 @@ msgstr ""
 msgid "SecurityConfiguration|More information"
 msgstr ""
 
+msgid "SecurityConfiguration|More scan types, including Container Scanning, DAST, Dependency Scanning, Fuzzing, and Licence Compliance"
+msgstr ""
+
 msgid "SecurityConfiguration|Not enabled"
 msgstr ""
 
@@ -28991,7 +28994,7 @@ msgstr ""
 msgid "SecurityConfiguration|Quickly enable all continuous testing and compliance tools by enabling %{linkStart}Auto DevOps%{linkEnd}"
 msgstr ""
 
-msgid "SecurityConfiguration|Runtime security metrics for application environments."
+msgid "SecurityConfiguration|Runtime security metrics for application environments"
 msgstr ""
 
 msgid "SecurityConfiguration|SAST Analyzers"
@@ -29000,7 +29003,7 @@ msgstr ""
 msgid "SecurityConfiguration|SAST Configuration"
 msgstr ""
 
-msgid "SecurityConfiguration|Secure your project with Ultimate"
+msgid "SecurityConfiguration|Secure your project"
 msgstr ""
 
 msgid "SecurityConfiguration|Security Control"
@@ -29027,10 +29030,7 @@ msgstr ""
 msgid "SecurityConfiguration|View history"
 msgstr ""
 
-msgid "SecurityConfiguration|Vulnerability details and statistics in the merge request."
-msgstr ""
-
-msgid "SecurityConfiguration|With the information provided, you can immediately begin risk analysis and remediation within GitLab."
+msgid "SecurityConfiguration|Vulnerability details and statistics in the merge request"
 msgstr ""
 
 msgid "SecurityConfiguration|You can quickly enable all security scanning tools by enabling %{linkStart}Auto DevOps%{linkEnd}."

spec/frontend/security_configuration/components/upgrade_banner_spec.js

@@ -43,11 +43,11 @@ describe('UpgradeBanner component', () => {
   it('renders the list of benefits', () => {
     const wrapperText = wrapper.text();
 
-    expect(wrapperText).toContain('GitLab Ultimate checks your application');
+    expect(wrapperText).toContain('Immediately begin risk analysis and remediation');
     expect(wrapperText).toContain('statistics in the merge request');
     expect(wrapperText).toContain('statistics across projects');
     expect(wrapperText).toContain('Runtime security metrics');
-    expect(wrapperText).toContain('risk analysis and remediation');
+    expect(wrapperText).toContain('More scan types, including Container Scanning,');
   });
 
   it(`re-emits GlBanner's close event`, () => {