Commit 5bd757b7 authored by Phil Hughes's avatar Phil Hughes

Merge branch '346344-fix-unnecessary-escaped-html' into 'master'

Label for depending merge requests unnecessarily escapes HTML

See merge request gitlab-org/gitlab!75111
parents a33b8fdc 03fbbaa7
...@@ -82,7 +82,11 @@ export default { ...@@ -82,7 +82,11 @@ export default {
); );
return this.closedCount > 0 return this.closedCount > 0
? `${mainText} <strong>${n__('(%d closed)', '(%d closed)', this.closedCount)}</strong>` ? `${mainText} %{strongStart}${n__(
'(%d closed)',
'(%d closed)',
this.closedCount,
)}%{strongEnd}`
: mainText; : mainText;
}, },
status() { status() {
......
...@@ -87,7 +87,7 @@ describe('BlockingMergeRequestsReport', () => { ...@@ -87,7 +87,7 @@ describe('BlockingMergeRequestsReport', () => {
createComponent(); createComponent();
expect(wrapper.vm.blockedByText).toBe( expect(wrapper.vm.blockedByText).toBe(
'Depends on 2 merge requests being merged <strong>(1 closed)</strong>', 'Depends on 2 merge requests being merged %{strongStart}(1 closed)%{strongEnd}',
); );
}); });
......
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