Commit 7dd7f14e authored by Amy Qualls's avatar Amy Qualls

Revise UI text for license-blocked MR

Bring this UI error message in line
with the new standard for messages
in merge requests.
parent b40be185
...@@ -20,7 +20,7 @@ export default { ...@@ -20,7 +20,7 @@ export default {
</div> </div>
<div class="media-body"> <div class="media-body">
<strong class="gl-font-weight-bold gl-text-gray-700 gl-pl-2"> <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> </strong>
</div> </div>
</div> </div>
......
...@@ -26,6 +26,6 @@ describe('EE MrWidgetPolicyViolation', () => { ...@@ -26,6 +26,6 @@ describe('EE MrWidgetPolicyViolation', () => {
}); });
it('shows the disabled reason', () => { 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.');
}); });
}); });
...@@ -41394,6 +41394,9 @@ msgstr "" ...@@ -41394,6 +41394,9 @@ msgstr ""
msgid "mrWidget|Merge blocked: all threads must be resolved." msgid "mrWidget|Merge blocked: all threads must be resolved."
msgstr "" 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." msgid "mrWidget|Merge blocked: fast-forward merge is not possible. To merge this request, first rebase locally."
msgstr "" msgstr ""
...@@ -41532,9 +41535,6 @@ msgstr "" ...@@ -41532,9 +41535,6 @@ msgstr ""
msgid "mrWidget|What is a merge train?" msgid "mrWidget|What is a merge train?"
msgstr "" msgstr ""
msgid "mrWidget|You can merge after removing denied licenses"
msgstr ""
msgid "mrWidget|You can only merge once this merge request is approved." msgid "mrWidget|You can only merge once this merge request is approved."
msgstr "" msgstr ""
......
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