Merge branch 'misaligned_approval_tr' into 'master'

Fix misaligned approval tr

Closes #38558

See merge request gitlab-org/gitlab!21368

changelogs/unreleased/misaligned_approval_tr.yml

+---
+title: Fix misaligned approval tr
+merge_request: 21368
+author: Lee Tickett
+type: fixed

ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_list.vue

@@ -137,7 +137,10 @@ export default {
             </div>
           </div>
         </td>
-        <td v-if="!rule.fallback" class="d-none d-sm-table-cell js-approvers">
+        <td
+          v-if="rule.rule_type !== $options.ruleTypeAnyApprover"
+          class="d-none d-sm-table-cell js-approvers"
+        >
           <div><user-avatar-list :items="rule.approvers" :img-size="24" empty-text="" /></div>
         </td>
         <td class="w-0 d-none d-sm-table-cell text-nowrap js-pending">

ee/spec/frontend/vue_mr_widget/components/approvals/approvals_list_spec.js

@@ -35,6 +35,7 @@ const testRuleFallback = () => ({
   id: 'fallback',
   name: '',
   fallback: true,
+  rule_type: 'any_approver',
   approvals_required: 3,
   approved_by: [{ id: 1 }, { id: 2 }],
   approvers: [],