Commit 0e418163 authored by Natalia Tepluhina's avatar Natalia Tepluhina

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

Update slot-scope syntax for project_rules

See merge request gitlab-org/gitlab!37733
parents f3b9c2b6 2473927a
...@@ -93,7 +93,7 @@ export default { ...@@ -93,7 +93,7 @@ export default {
<template> <template>
<rules :rules="rules"> <rules :rules="rules">
<template slot="thead" slot-scope="{ name, members, approvalsRequired, branches }"> <template #thead="{ name, members, approvalsRequired, branches }">
<tr class="d-none d-sm-table-row"> <tr class="d-none d-sm-table-row">
<th class="w-25">{{ hasNamedRule ? name : members }}</th> <th class="w-25">{{ hasNamedRule ? name : members }}</th>
<th :class="settings.allowMultiRule ? 'w-50 d-none d-sm-table-cell' : 'w-75'"> <th :class="settings.allowMultiRule ? 'w-50 d-none d-sm-table-cell' : 'w-75'">
...@@ -104,7 +104,7 @@ export default { ...@@ -104,7 +104,7 @@ export default {
<th></th> <th></th>
</tr> </tr>
</template> </template>
<template slot="tbody" slot-scope="{ rules }"> <template #tbody="{ rules }">
<template v-for="(rule, index) in rules"> <template v-for="(rule, index) in rules">
<empty-rule <empty-rule
v-if="rule.ruleType === 'any_approver'" v-if="rule.ruleType === 'any_approver'"
...@@ -116,9 +116,7 @@ export default { ...@@ -116,9 +116,7 @@ export default {
:can-edit="canEdit(rule)" :can-edit="canEdit(rule)"
/> />
<tr v-else :key="index"> <tr v-else :key="index">
<td class="js-name"> <td class="js-name">{{ rule.name }}</td>
{{ rule.name }}
</td>
<td class="js-members" :class="settings.allowMultiRule ? 'd-none d-sm-table-cell' : null"> <td class="js-members" :class="settings.allowMultiRule ? 'd-none d-sm-table-cell' : null">
<user-avatar-list :items="rule.approvers" :img-size="24" empty-text="" /> <user-avatar-list :items="rule.approvers" :img-size="24" empty-text="" />
</td> </td>
......
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