diff --git a/app/assets/javascripts/milestone_select.js b/app/assets/javascripts/milestone_select.js index c6ba3c9600715d9dff23a0b50fbfeb7279aac7a4..afe9f3c2c711716232c0b7a4b2ac3442fa6d76ae 100644 --- a/app/assets/javascripts/milestone_select.js +++ b/app/assets/javascripts/milestone_select.js @@ -148,7 +148,6 @@ import _ from 'underscore'; $(`[data-milestone-id="${selectedMilestone}"] > a`, $el).addClass('is-active'); }, vue: $dropdown.hasClass('js-issue-board-sidebar'), -<<<<<<< HEAD hideRow: function(milestone) { if ($('html').hasClass('issue-boards-page') && !$dropdown.hasClass('js-issue-board-sidebar') && !$dropdown.closest('.add-issues-modal').length && gl.issueBoards.BoardsStore.state.currentBoard.milestone && @@ -167,8 +166,6 @@ import _ from 'underscore'; return true; }, -======= ->>>>>>> upstream/master clicked: function(clickEvent) { const { $el, e } = clickEvent; let selected = clickEvent.selectedObj;