Commit ff64773b authored by Fernando's avatar Fernando

Update merge request button message for license-check approvals

* Update text and i18n translations
* Update unit tests
parent 111b6286
......@@ -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>
......
---
title: Update merge request button messaging for license-check approval
merge_request: 231250
author:
type: fixed
......@@ -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');
});
});
......@@ -28727,10 +28727,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"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment