diff options
author | Clement Ho <ClemMakesApps@gmail.com> | 2017-05-05 09:19:58 -0500 |
---|---|---|
committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-05-05 09:19:58 -0500 |
commit | 40f51c8e8172933ec511dd828a589abb52d83c45 (patch) | |
tree | 80d5b64671bfd53a455141a3bdec6e2bc489a756 /app/assets | |
parent | 5004579b15b0585c0a26231d7422fb1d8086bd66 (diff) | |
download | gitlab-ce-40f51c8e8172933ec511dd828a589abb52d83c45.tar.gz |
[skip ci] Fix FE conflicts with master
Diffstat (limited to 'app/assets')
4 files changed, 3 insertions, 19 deletions
diff --git a/app/assets/javascripts/boards/components/issue_card_inner.js b/app/assets/javascripts/boards/components/issue_card_inner.js index 2f06d186c50..710207db0c7 100644 --- a/app/assets/javascripts/boards/components/issue_card_inner.js +++ b/app/assets/javascripts/boards/components/issue_card_inner.js @@ -157,7 +157,7 @@ gl.issueBoards.IssueCardInner = Vue.extend({ > <img class="avatar avatar-inline s20" - :src="assignee.avatarUrl" + :src="assignee.avatar" width="20" height="20" :alt="avatarUrlTitle(assignee)" diff --git a/app/assets/javascripts/boards/models/assignee.js b/app/assets/javascripts/boards/models/assignee.js index c07a840ec37..05dd449e4fd 100644 --- a/app/assets/javascripts/boards/models/assignee.js +++ b/app/assets/javascripts/boards/models/assignee.js @@ -1,20 +1,11 @@ -<<<<<<< HEAD:app/assets/javascripts/boards/models/assignee.js /* eslint-disable no-unused-vars */ class ListAssignee { - constructor(user) { - this.id = user.id; - this.name = user.name; - this.username = user.username; - this.avatarUrl = user.avatar_url; -======= -class ListUser { constructor(user, defaultAvatar) { this.id = user.id; this.name = user.name; this.username = user.username; this.avatar = user.avatar_url || defaultAvatar; ->>>>>>> 10c1bf2d77fd0ab21309d0b136cbc0ac11f56c77:app/assets/javascripts/boards/models/user.js } } diff --git a/app/assets/javascripts/boards/models/issue.js b/app/assets/javascripts/boards/models/issue.js index 33c2fab99c7..6c2d8a3781b 100644 --- a/app/assets/javascripts/boards/models/issue.js +++ b/app/assets/javascripts/boards/models/issue.js @@ -18,13 +18,6 @@ class ListIssue { this.selected = false; this.position = obj.relative_position || Infinity; -<<<<<<< HEAD -======= - if (obj.assignee) { - this.assignee = new ListUser(obj.assignee, defaultAvatar); - } - ->>>>>>> 10c1bf2d77fd0ab21309d0b136cbc0ac11f56c77 if (obj.milestone) { this.milestone = new ListMilestone(obj.milestone); } @@ -33,7 +26,7 @@ class ListIssue { this.labels.push(new ListLabel(label)); }); - this.assignees = obj.assignees.map(a => new ListAssignee(a)); + this.assignees = obj.assignees.map(a => new ListAssignee(a, defaultAvatar)); } addLabel (label) { diff --git a/app/assets/javascripts/sidebar/components/assignees/assignees.js b/app/assets/javascripts/sidebar/components/assignees/assignees.js index 88d7650f40a..7e5feac622c 100644 --- a/app/assets/javascripts/sidebar/components/assignees/assignees.js +++ b/app/assets/javascripts/sidebar/components/assignees/assignees.js @@ -84,7 +84,7 @@ export default { return !this.showLess || (index < this.defaultRenderCount && this.showLess); }, avatarUrl(user) { - return user.avatarUrl || user.avatar_url; + return user.avatar || user.avatar_url; }, assigneeUrl(user) { return `${this.rootPath}${user.username}`; |