diff options
| author | Phil Hughes <me@iamphill.com> | 2016-10-19 08:44:55 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-10-19 08:44:55 +0100 |
| commit | f1350a5c825610f908ed7182855af436fe4957dd (patch) | |
| tree | f72b471c2abc99b37ee30f716363d8a29b75fe77 /app/assets/javascripts/labels_select.js | |
| parent | e4176f4ec42fa8e391b088d62deef051cdafaf23 (diff) | |
| parent | f64e36c44832db125beab5923c0177ff69ccedba (diff) | |
| download | gitlab-ce-f1350a5c825610f908ed7182855af436fe4957dd.tar.gz | |
Merge branch 'master' into issue-board-sidebar
Diffstat (limited to 'app/assets/javascripts/labels_select.js')
| -rw-r--r-- | app/assets/javascripts/labels_select.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/labels_select.js b/app/assets/javascripts/labels_select.js index 19eb0ab4294..2eb7c4ea211 100644 --- a/app/assets/javascripts/labels_select.js +++ b/app/assets/javascripts/labels_select.js @@ -292,7 +292,7 @@ return; } - if (page === 'projects:boards:show') { + if ($('html').hasClass('issue-boards-page')) { return; } if ($dropdown.hasClass('js-multiselect')) { @@ -335,7 +335,7 @@ page = $('body').data('page'); isIssueIndex = page === 'projects:issues:index'; isMRIndex = page === 'projects:merge_requests:index'; - if (page === 'projects:boards:show' && !$dropdown.hasClass('js-issue-board-sidebar')) { + if ($('html').hasClass('issue-boards-page') && !$dropdown.hasClass('js-issue-board-sidebar')) { if (label.isAny) { gl.issueBoards.BoardsStore.state.filters['label_name'] = []; } |