Update pot file translations

* Resolve merge conflict

ee/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_policy_violation.vue

@@ -12,14 +12,14 @@ export default {
   <div class="mr-widget-body media">
     <div class="space-children">
       <status-icon status="warning" />
-      <button type="button" class="btn btn-success btn-sm" disabled="true">
+      <gl-button category="primary" variant="success" disabled="disabled" size="small">
         {{ s__('mrWidget|Merge') }}
-      </button>
+      </gl-button>
     </div>
     <div class="media-body">
-      <span class="bold">
+      <strong>
         {{ s__('mrWidget|You can only merge once the denied license is removed') }}
-      </span>
+      </strong>
     </div>
   </div>
 </template>

ee/app/assets/javascripts/vue_shared/license_compliance/store/actions.js

@@ -114,14 +114,12 @@ export const receiveSetLicenseApprovalError = ({ commit }, error) => {
 export const fetchLicenseCheckApprovalRule = ({ dispatch, state }) => {
   dispatch('requestLicenseCheckApprovalRule');
 
-  axios
+  return axios
     .get(state.approvalsApiPath)
     .then(({ data }) => {
-      const hasLicenseCheckApprovalRule = Boolean(
-        data.approval_rules_left.find(rule => {
-          return rule.name === 'License-Check';
-        }),
-      );
+      const hasLicenseCheckApprovalRule = data.approval_rules_left.some(rule => {
+        return rule.name === 'License-Check';
+      });
 
       dispatch('receiveLicenseCheckApprovalRuleSuccess', { hasLicenseCheckApprovalRule });
     })

ee/app/assets/javascripts/vue_shared/license_compliance/store/getters.js

@@ -21,11 +21,11 @@ export const licenseReportGroups = state =>
   );
 
 export const hasReportItems = (_, getters) => {
-  return getters.licenseReport && getters.licenseReport.length;
+  return Boolean(getters.licenseReport && getters.licenseReport.length);
 };
 
 export const baseReportHasLicenses = state => {
-  return state.existingLicenses.length;
+  return Boolean(state.existingLicenses.length);
 };
 
 export const licenseReportLength = (_, getters) => {

ee/spec/frontend/vue_mr_widget/components/states/mr_widget_policy_violation_spec.js

@@ -15,18 +15,16 @@ describe('EE MrWidgetPolicyViolation', () => {
     wrapper = null;
   });
 
-  describe('when shown', () => {
-    beforeEach(() => {
-      createComponent();
-    });
+  beforeEach(() => {
+    createComponent();
+  });
 
-    it('shows the disabled merge button', () => {
-      expect(wrapper.text()).toContain('Merge');
-      expect(findButton().attributes().disabled).toBe('disabled');
-    });
+  it('shows the disabled merge button', () => {
+    expect(wrapper.text()).toContain('Merge');
+    expect(findButton().attributes().disabled).toBe('disabled');
+  });
 
-    it('shows the disabled reason', () => {
-      expect(wrapper.text()).toContain('You can only merge once the denied license is removed');
-    });
+  it('shows the disabled reason', () => {
+    expect(wrapper.text()).toContain('You can only merge once the denied license is removed');
   });
 });