Merge branch '231250-fix-license-check-approval-message' into 'master'

Update merge request button message for license-check approvals

Closes #231250

See merge request gitlab-org/gitlab!37954

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

@@ -20,7 +20,7 @@ export default {
     </div>
     <div class="media-body">
       <strong class="gl-font-weight-bold gl-text-gray-800 gl-pl-2">
-        {{ s__('mrWidget|You can only merge once the denied license is removed') }}
+        {{ s__('mrWidget|You can merge after removing denied licenses') }}
       </strong>
     </div>
   </div>

ee/changelogs/unreleased/231250-fix-license-check-approval-message.yml

+---
+title: Update merge request button messaging for license-check approval
+merge_request: 37954
+author:
+type: changed

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

@@ -26,6 +26,6 @@ describe('EE MrWidgetPolicyViolation', () => {
   });
 
   it('shows the disabled reason', () => {
-    expect(wrapper.text()).toContain('You can only merge once the denied license is removed');
+    expect(wrapper.text()).toContain('You can merge after removing denied licenses');
   });
 });

locale/gitlab.pot

@@ -28874,10 +28874,10 @@ msgstr ""
 msgid "mrWidget|You can delete the source branch now"
 msgstr ""
 
-msgid "mrWidget|You can merge this merge request manually using the"
+msgid "mrWidget|You can merge after removing denied licenses"
 msgstr ""
 
-msgid "mrWidget|You can only merge once the denied license is removed"
+msgid "mrWidget|You can merge this merge request manually using the"
 msgstr ""
 
 msgid "mrWidget|Your password"