[skip ci] Fix FE conflicts with master
This commit is contained in:
parent
5004579b15
commit
40f51c8e81
|
@ -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)"
|
||||
|
|
|
@ -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
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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}`;
|
||||
|
|
|
@ -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',
|
||||
|
|
|
@ -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);
|
||||
});
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue