Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
2f6b4ca5
Commit
2f6b4ca5
authored
Jul 23, 2020
by
sstern
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rm deprecated syntax for slot-scope in mr_rules
parent
7a5db690
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
5 deletions
+3
-5
ee/app/assets/javascripts/approvals/components/mr_edit/mr_rules.vue
...ets/javascripts/approvals/components/mr_edit/mr_rules.vue
+3
-5
No files found.
ee/app/assets/javascripts/approvals/components/mr_edit/mr_rules.vue
View file @
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"
/>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment