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
4ae71a90
Commit
4ae71a90
authored
Dec 19, 2016
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix avatarSizeClass error and nonUser -> clickable.
parent
e68a7f3c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
6 deletions
+10
-6
app/assets/javascripts/merge_request_widget/approvals/components/approvals_body.js.es6
...request_widget/approvals/components/approvals_body.js.es6
+5
-0
app/assets/javascripts/merge_request_widget/approvals/components/approvals_footer.js.es6
...quest_widget/approvals/components/approvals_footer.js.es6
+1
-1
app/assets/javascripts/vue_common_component/link_to_member_avatar.js.es6
...scripts/vue_common_component/link_to_member_avatar.js.es6
+4
-5
No files found.
app/assets/javascripts/merge_request_widget/approvals/components/approvals_body.js.es6
View file @
4ae71a90
...
...
@@ -12,6 +12,11 @@
},
approverNamesStringified() {
const approvers = this.suggestedApprovers;
if (!approvers) {
return '';
}
return approvers.length === 1 ? approvers[0].name :
approvers.reduce((memo, curr, index) => {
const nextMemo = `${memo}${curr.name}`;
...
...
app/assets/javascripts/merge_request_widget/approvals/components/approvals_footer.js.es6
View file @
4ae71a90
...
...
@@ -36,7 +36,7 @@
</span>
<span v-for='n in approvalsLeft'>
<link-to-member-avatar
:
non-user='tru
e'
:
clickable='fals
e'
:avatar-html='pendingAvatarSvg'
:show-tooltip='false'
extra-link-class='hide-asset'>
...
...
app/assets/javascripts/vue_common_component/link_to_member_avatar.js.es6
View file @
4ae71a90
...
...
@@ -32,9 +32,9 @@
required: false,
default: false,
},
nonUser
: {
clickable
: {
type: Boolean,
default:
fals
e,
default:
tru
e,
required: false,
},
tooltipContainer: {
...
...
@@ -53,13 +53,12 @@
},
data() {
return {
// TODO: Rename baseClass
avatarBaseClass: 'avatar avatar-inline',
};
},
computed: {
avatarSizeClass() {
return `s${this.
avatarSizeClass
}`;
return `s${this.
size
}`;
},
avatarHtmlClass() {
return `${this.avatarSizeClass} ${this.avatarBaseClass}`;
...
...
@@ -71,7 +70,7 @@
return `${this.avatarBaseClass} ${this.avatarSizeClass} ${this.extraAvatarClass}`;
},
disabledClass() {
return
this.nonUser
? 'disabled' : '';
return
!this.clickable
? 'disabled' : '';
},
linkClass() {
return `author_link ${this.tooltipClass} ${this.extraLinkClass} ${this.disabledClass}`
...
...
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