[skip ci] Fix FE conflicts with master

7 files changed, 5 insertions, 36 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}`;
diff --git a/config/webpack.config.js b/config/webpack.config.js
index a539dc511fa..bc2aa1ebf0c 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -34,11 +34,6 @@ var config = {
     graphs:               './graphs/graphs_bundle.js',
     group:                './group.js',
     groups_list:          './groups_list.js',
-<<<<<<< HEAD
-=======
-    issuable:             './issuable/issuable_bundle.js',
-    locale:               './locale/index.js',
->>>>>>> 10c1bf2d77fd0ab21309d0b136cbc0ac11f56c77
     issue_show:           './issue_show/index.js',
     locale:               './locale/index.js',
     main:                 './main.js',
diff --git a/spec/javascripts/boards/issue_card_spec.js b/spec/javascripts/boards/issue_card_spec.js
index f872ca1040b..fddde799d01 100644
--- a/spec/javascripts/boards/issue_card_spec.js
+++ b/spec/javascripts/boards/issue_card_spec.js
@@ -148,11 +148,11 @@ describe('Issue card component', () => {
 
     describe('assignee default avatar', () => {
       beforeEach((done) => {
-        component.issue.assignee = new ListUser({
+        component.issue.assignees = [new ListAssignee({
           id: 1,
           name: 'testing 123',
           username: 'test',
-        }, 'default_avatar');
+        }, 'default_avatar')];
 
         Vue.nextTick(done);
       });
diff --git a/spec/support/time_tracking_shared_examples.rb b/spec/support/time_tracking_shared_examples.rb
index c8e7af19f89..84ef46ffa27 100644
--- a/spec/support/time_tracking_shared_examples.rb
+++ b/spec/support/time_tracking_shared_examples.rb
@@ -37,12 +37,7 @@ shared_examples 'issuable time tracker' do
     submit_time('/estimate 3w 1d 1h')
     submit_time('/remove_estimate')
 
-<<<<<<< HEAD
     page.within '.time-tracking-component-wrap' do
-=======
-    wait_for_ajax
-    page.within '#issuable-time-tracker' do
->>>>>>> 10c1bf2d77fd0ab21309d0b136cbc0ac11f56c77
       expect(page).to have_content 'No estimate or time spent'
     end
   end
@@ -51,12 +46,7 @@ shared_examples 'issuable time tracker' do
     submit_time('/spend 3w 1d 1h')
     submit_time('/remove_time_spent')
 
-<<<<<<< HEAD
     page.within '.time-tracking-component-wrap' do
-=======
-    wait_for_ajax
-    page.within '#issuable-time-tracker' do
->>>>>>> 10c1bf2d77fd0ab21309d0b136cbc0ac11f56c77
       expect(page).to have_content 'No estimate or time spent'
     end
   end