1 files changed, 8 insertions, 1 deletions
diff --git a/app/assets/javascripts/boards/models/issue.js b/app/assets/javascripts/boards/models/issue.js
index 76ebd4c9eab..33c2fab99c7 100644
--- a/app/assets/javascripts/boards/models/issue.js
+++ b/app/assets/javascripts/boards/models/issue.js
@@ -6,7 +6,7 @@
 import Vue from 'vue';
 
 class ListIssue {
-  constructor (obj) {
+  constructor (obj, defaultAvatar) {
     this.globalId = obj.id;
     this.id = obj.iid;
     this.title = obj.title;
@@ -18,6 +18,13 @@ 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);
     }