Merge branch 'aqualls-ui-license-blocked' into 'master'

Revise UI text for license-blocked MR

See merge request gitlab-org/gitlab!74654

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-700 gl-pl-2">
-        {{ s__('mrWidget|You can merge after removing denied licenses') }}
+        {{ s__('mrWidget|Merge blocked: denied licenses must be removed.') }}
       </strong>
     </div>
   </div>

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 merge after removing denied licenses');
+    expect(wrapper.text()).toContain('Merge blocked: denied licenses must be removed.');
   });
 });

locale/gitlab.pot

@@ -41436,6 +41436,9 @@ msgstr ""
 msgid "mrWidget|Merge blocked: all threads must be resolved."
 msgstr ""
 
+msgid "mrWidget|Merge blocked: denied licenses must be removed."
+msgstr ""
+
 msgid "mrWidget|Merge blocked: fast-forward merge is not possible. To merge this request, first rebase locally."
 msgstr ""
 
@@ -41574,9 +41577,6 @@ msgstr ""
 msgid "mrWidget|What is a merge train?"
 msgstr ""
 
-msgid "mrWidget|You can merge after removing denied licenses"
-msgstr ""
-
 msgid "mrWidget|You can only merge once this merge request is approved."
 msgstr ""