Merge branch '356484-text-tweaks-license-compliance' into 'master'

Adjust icons and button wording for license compliance

See merge request gitlab-org/gitlab!83703

ee/app/assets/javascripts/approvals/components/license_compliance/index.vue

@@ -56,7 +56,7 @@ export default {
 <template>
   <span class="gl-display-inline-flex gl-align-items-center">
     <gl-button :loading="isLoading" @click="openModal(licenseCheckRule)"
-      >{{ s__('LicenseCompliance|License Approvals') }}
+      >{{ s__('LicenseCompliance|Update approvals') }}
     </gl-button>
     <span data-testid="licenseCheckStatus" class="gl-ml-3">
       <gl-skeleton-loading
@@ -66,7 +66,7 @@ export default {
         class="gl-display-inline-flex gl-h-auto gl-align-items-center"
       />
       <span v-else class="gl-m-0 gl-font-weight-normal">
-        <gl-icon name="information" :size="12" class="gl-text-blue-600" />
+        <gl-icon name="information-o" :size="12" class="gl-text-blue-600" />
         <gl-sprintf :message="licenseCheckStatusText">
           <template #docLink="{ content }">
             <gl-link :href="documentationPath" target="_blank">{{ content }}</gl-link>

ee/app/assets/javascripts/dependencies/components/app.vue

@@ -137,7 +137,7 @@ export default {
             :href="documentationPath"
             :aria-label="__('Dependencies help page link')"
           >
-            <gl-icon name="question" />
+            <gl-icon name="question-o" />
           </gl-link>
         </h2>
         <p class="mb-0">

ee/app/assets/javascripts/dependencies/components/dependencies_table.vue

@@ -117,7 +117,7 @@ export default {
   >
     <template #head(location)="data">
       {{ data.label }}
-      <gl-icon id="location-info" name="information" class="gl-text-blue-600" />
+      <gl-icon id="location-info" name="information-o" class="gl-text-blue-600" />
       <gl-popover
         target="location-info"
         placement="top"

ee/app/assets/javascripts/license_compliance/components/app.vue

@@ -115,7 +115,7 @@ export default {
       <h2 class="h4 mb-1 gl-display-flex gl-align-items-center">
         {{ s__('Licenses|License Compliance') }}
         <gl-link :href="documentationPath" class="gl-ml-3" target="_blank">
-          <gl-icon name="question" />
+          <gl-icon name="question-o" />
         </gl-link>
       </h2>
 

ee/app/assets/javascripts/threat_monitoring/components/app.vue

@@ -54,7 +54,7 @@ export default {
           :href="documentationPath"
           :aria-label="s__('ThreatMonitoring|Threat Monitoring help page link')"
         >
-          <gl-icon name="question" />
+          <gl-icon name="question-o" />
         </gl-link>
         <gl-popover :target="() => $refs.helpLink">
           {{ $options.helpPopoverText }}

ee/spec/frontend/approvals/components/license_compliance/index_spec.js

@@ -108,7 +108,7 @@ describe('EE Approvals LicenseCompliance', () => {
     });
 
     it('renders an information icon', () => {
-      expect(findInformationIcon().props('name')).toBe('information');
+      expect(findInformationIcon().props('name')).toBe('information-o');
     });
 
     it('opens the link to the documentation page in a new tab', () => {

locale/gitlab.pot

@@ -22239,9 +22239,6 @@ msgstr ""
 msgid "LicenseCompliance|Learn more about %{linkStart}License Approvals%{linkEnd}"
 msgstr ""
 
-msgid "LicenseCompliance|License Approvals"
-msgstr ""
-
 msgid "LicenseCompliance|License Compliance detected %d license and policy violation for the source branch only"
 msgid_plural "LicenseCompliance|License Compliance detected %d licenses and policy violations for the source branch only"
 msgstr[0] ""
@@ -22310,6 +22307,9 @@ msgstr ""
 msgid "LicenseCompliance|Uncategorized"
 msgstr ""
 
+msgid "LicenseCompliance|Update approvals"
+msgstr ""
+
 msgid "LicenseCompliance|You are about to remove the license, %{name}, from this project."
 msgstr ""