Commit 649e7e8d authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch 'ss/slot-scope-mr-rules' into 'master'

Rm deprecated syntax for slot-scope in mr_rules

See merge request gitlab-org/gitlab!37732
parents 1a0c16fd 2f6b4ca5
......@@ -108,7 +108,7 @@ export default {
<template>
<rules :rules="rules">
<template slot="thead" slot-scope="{ name, members, approvalsRequired }">
<template #thead="{ name, members, approvalsRequired }">
<tr>
<th :class="hasNamedRule ? 'w-25' : 'w-75'">{{ hasNamedRule ? name : members }}</th>
<th :class="hasNamedRule ? 'w-50' : null">
......@@ -118,7 +118,7 @@ export default {
<th></th>
</tr>
</template>
<template slot="tbody" slot-scope="{ rules }">
<template #tbody="{ rules }">
<template v-for="(rule, index) in rules">
<empty-rule
v-if="rule.ruleType === 'any_approver'"
......@@ -131,9 +131,7 @@ export default {
<tr v-else :key="index">
<td>
<div class="js-name">{{ rule.name }}</div>
<div ref="indicator" class="text-muted">
{{ indicatorText(rule) }}
</div>
<div ref="indicator" class="text-muted">{{ indicatorText(rule) }}</div>
</td>
<td class="js-members" :class="settings.allowMultiRule ? 'd-none d-sm-table-cell' : null">
<user-avatar-list :items="rule.approvers" :img-size="24" />
......
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