diff options
author | Clement Ho <ClemMakesApps@gmail.com> | 2017-05-05 17:19:58 +0300 |
---|---|---|
committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-05-05 17:19:58 +0300 |
commit | 40f51c8e8172933ec511dd828a589abb52d83c45 (patch) | |
tree | 80d5b64671bfd53a455141a3bdec6e2bc489a756 /app/assets/javascripts/sidebar | |
parent | 5004579b15b0585c0a26231d7422fb1d8086bd66 (diff) |
[skip ci] Fix FE conflicts with master
Diffstat (limited to 'app/assets/javascripts/sidebar')
-rw-r--r-- | app/assets/javascripts/sidebar/components/assignees/assignees.js | 2 |
1 files changed, 1 insertions, 1 deletions
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}`; |