kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fixed JS conflicts

This commit is contained in:
Phil Hughes 2017-02-27 12:36:43 +00:00
parent 16808a2750
commit c401088bc7
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/assets/javascripts/boards/models/list.js.es6
View File

@ -134,31 +134,24 @@ class List {
if (listFrom) {
this.issuesSize += 1;
<<<<<<< HEAD
gl.boardService.moveIssue(issue.id, listFrom.id, this.id, moveBeforeIid, moveAfterIid)
.then(() => {
listFrom.getIssues(false);
});
=======
this.updateIssueLabel(issue, listFrom);
>>>>>>> 82f6c0f5ac4ed29390ed90592d2c431f3494d93f
this.updateIssueLabel(issue, listFrom, moveBeforeIid, moveAfterIid);
}
}
}
<<<<<<< HEAD
moveIssue (issue, oldIndex, newIndex, moveBeforeIid, moveAfterIid) {
this.issues.splice(oldIndex, 1);
this.issues.splice(newIndex, 0, issue);
gl.boardService.moveIssue(issue.id, null, null, moveBeforeIid, moveAfterIid);
=======
updateIssueLabel(issue, listFrom) {
gl.boardService.moveIssue(issue.id, listFrom.id, this.id)
}
updateIssueLabel(issue, listFrom, moveBeforeIid, moveAfterIid) {
gl.boardService.moveIssue(issue.id, listFrom.id, this.id, moveBeforeIid, moveAfterIid)
.then(() => {
listFrom.getIssues(false);
});
>>>>>>> 82f6c0f5ac4ed29390ed90592d2c431f3494d93f
}
findIssue (id) {