diff options
author | Clement Ho <ClemMakesApps@gmail.com> | 2017-05-04 19:43:45 +0300 |
---|---|---|
committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-05-04 19:43:45 +0300 |
commit | 4b1d580a84016397bc1dfd0d089b8ed7ace9228d (patch) | |
tree | 53103ac934607bd0196d76a2e60f3888b21f21d0 /app/assets/javascripts/milestone_select.js | |
parent | dde9b6698bb67dc34650a588ad3e644843067800 (diff) |
Fix FE conflicts
Diffstat (limited to 'app/assets/javascripts/milestone_select.js')
-rw-r--r-- | app/assets/javascripts/milestone_select.js | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/app/assets/javascripts/milestone_select.js b/app/assets/javascripts/milestone_select.js index 0ca7aedb5bd..11e68c0a3be 100644 --- a/app/assets/javascripts/milestone_select.js +++ b/app/assets/javascripts/milestone_select.js @@ -121,30 +121,10 @@ return $value.css('display', ''); }, vue: $dropdown.hasClass('js-issue-board-sidebar'), -<<<<<<< HEAD - clicked: function(selected, $el, e) { -======= - 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) { - return milestone !== gl.issueBoards.BoardsStore.state.currentBoard.milestone.title; - } - - return false; - }, - isSelectable: function() { - if ($('html').hasClass('issue-boards-page') && !$dropdown.hasClass('js-issue-board-sidebar') && - !$dropdown.closest('.add-issues-modal').length && gl.issueBoards.BoardsStore.state.currentBoard.milestone_id) { - return false; - } - - return true; - }, clicked: function(options) { const { $el, e } = options; let selected = options.selectedObj; ->>>>>>> b0a2435... Merge branch 'multiple_assignees_review_upstream' into ee_master var data, isIssueIndex, isMRIndex, page, boardsStore; page = $('body').data('page'); isIssueIndex = page === 'projects:issues:index'; |