Add latest changes from gitlab-org/gitlab@master

5 files changed, 16 insertions, 21 deletions

diff --git a/app/assets/javascripts/boards/index.js b/app/assets/javascripts/boards/index.js
index f72fc8d54b3..781cb0c1cc9 100644
--- a/app/assets/javascripts/boards/index.js
+++ b/app/assets/javascripts/boards/index.js
@@ -84,7 +84,6 @@ export default () => {
       rootPath: $boardApp.dataset.rootPath,
       bulkUpdatePath: $boardApp.dataset.bulkUpdatePath,
       detailIssue: boardsStore.detail,
-      defaultAvatar: $boardApp.dataset.defaultAvatar,
     },
     computed: {
       detailIssueVisible() {
@@ -130,13 +129,10 @@ export default () => {
               position = -1;
             }
 
-            boardsStore.addList(
-              {
-                ...listObj,
-                position,
-              },
-              this.defaultAvatar,
-            );
+            boardsStore.addList({
+              ...listObj,
+              position,
+            });
           });
 
           boardsStore.addBlankState();
diff --git a/app/assets/javascripts/boards/models/assignee.js b/app/assets/javascripts/boards/models/assignee.js
index 4a29b0d0581..5f5758583bb 100644
--- a/app/assets/javascripts/boards/models/assignee.js
+++ b/app/assets/javascripts/boards/models/assignee.js
@@ -1,9 +1,9 @@
 export default class ListAssignee {
-  constructor(obj, defaultAvatar) {
+  constructor(obj) {
     this.id = obj.id;
     this.name = obj.name;
     this.username = obj.username;
-    this.avatar = obj.avatar_url || obj.avatar || defaultAvatar;
+    this.avatar = obj.avatar_url || obj.avatar || gon.default_avatar_url;
     this.path = obj.path;
     this.state = obj.state;
     this.webUrl = obj.web_url || obj.webUrl;
diff --git a/app/assets/javascripts/boards/models/issue.js b/app/assets/javascripts/boards/models/issue.js
index 4f5d583e61f..d099c4b930c 100644
--- a/app/assets/javascripts/boards/models/issue.js
+++ b/app/assets/javascripts/boards/models/issue.js
@@ -10,7 +10,7 @@ import IssueProject from './project';
 import boardsStore from '../stores/boards_store';
 
 class ListIssue {
-  constructor(obj, defaultAvatar) {
+  constructor(obj) {
     this.subscribed = obj.subscribed;
     this.labels = [];
     this.assignees = [];
@@ -22,11 +22,11 @@ class ListIssue {
     this.closed = obj.closed;
     this.isLoading = {};
 
-    this.refreshData(obj, defaultAvatar);
+    this.refreshData(obj);
   }
 
-  refreshData(obj, defaultAvatar) {
-    boardsStore.refreshIssueData(this, obj, defaultAvatar);
+  refreshData(obj) {
+    boardsStore.refreshIssueData(this, obj);
   }
 
   addLabel(label) {
diff --git a/app/assets/javascripts/boards/models/list.js b/app/assets/javascripts/boards/models/list.js
index ff50b8ed7d1..990b648190a 100644
--- a/app/assets/javascripts/boards/models/list.js
+++ b/app/assets/javascripts/boards/models/list.js
@@ -36,7 +36,7 @@ const TYPES = {
 };
 
 class List {
-  constructor(obj, defaultAvatar) {
+  constructor(obj) {
     this.id = obj.id;
     this._uid = this.guid();
     this.position = obj.position;
@@ -55,7 +55,6 @@ class List {
     this.maxIssueCount = Object.hasOwnProperty.call(obj, 'max_issue_count')
       ? obj.max_issue_count
       : 0;
-    this.defaultAvatar = defaultAvatar;
 
     if (obj.label) {
       this.label = new ListLabel(obj.label);
@@ -156,7 +155,7 @@ class List {
 
   createIssues(data) {
     data.forEach(issueObj => {
-      this.addIssue(new ListIssue(issueObj, this.defaultAvatar));
+      this.addIssue(new ListIssue(issueObj));
     });
   }
 
diff --git a/app/assets/javascripts/boards/stores/boards_store.js b/app/assets/javascripts/boards/stores/boards_store.js
index 2a2cff3d07d..528dc4ed68e 100644
--- a/app/assets/javascripts/boards/stores/boards_store.js
+++ b/app/assets/javascripts/boards/stores/boards_store.js
@@ -74,8 +74,8 @@ const boardsStore = {
   showPage(page) {
     this.state.currentPage = page;
   },
-  addList(listObj, defaultAvatar) {
-    const list = new List(listObj, defaultAvatar);
+  addList(listObj) {
+    const list = new List(listObj);
     this.state.lists = _.sortBy([...this.state.lists, list], 'position');
 
     return list;
@@ -602,7 +602,7 @@ const boardsStore = {
   clearMultiSelect() {
     this.multiSelect.list = [];
   },
-  refreshIssueData(issue, obj, defaultAvatar) {
+  refreshIssueData(issue, obj) {
     issue.id = obj.id;
     issue.iid = obj.iid;
     issue.title = obj.title;
@@ -631,7 +631,7 @@ const boardsStore = {
     }
 
     if (obj.assignees) {
-      issue.assignees = obj.assignees.map(a => new ListAssignee(a, defaultAvatar));
+      issue.assignees = obj.assignees.map(a => new ListAssignee(a));
     }
   },
 };