Commit a2c92236 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch '233082-remove-none-in-approved-by' into 'master'

Show blank empty text for approved by in MR widget

Closes #233082

See merge request gitlab-org/gitlab!38436
parents 5d880d71 e5f26cd2
...@@ -164,7 +164,7 @@ export default { ...@@ -164,7 +164,7 @@ export default {
{{ pendingApprovalsText(rule) }} {{ pendingApprovalsText(rule) }}
</td> </td>
<td class="d-none d-sm-table-cell js-approved-by"> <td class="d-none d-sm-table-cell js-approved-by">
<user-avatar-list :items="rule.approved_by" :img-size="24" /> <user-avatar-list :items="rule.approved_by" :img-size="24" empty-text="" />
</td> </td>
</tr> </tr>
</tbody> </tbody>
......
---
title: Show blank empty text for approved by in MR widget
merge_request: 38436
author:
type: changed
...@@ -160,6 +160,7 @@ describe('EE MRWidget approvals list', () => { ...@@ -160,6 +160,7 @@ describe('EE MRWidget approvals list', () => {
expect(approvers.props()).toEqual( expect(approvers.props()).toEqual(
expect.objectContaining({ expect.objectContaining({
items: rule.approved_by, items: rule.approved_by,
emptyText: '',
}), }),
); );
}); });
......
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