summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/assets/javascripts/boards/stores/boards_store.js.es61
-rw-r--r--app/assets/javascripts/labels_select.js4
2 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/boards/stores/boards_store.js.es6 b/app/assets/javascripts/boards/stores/boards_store.js.es6
index fcd5ada2265..daa41056dc7 100644
--- a/app/assets/javascripts/boards/stores/boards_store.js.es6
+++ b/app/assets/javascripts/boards/stores/boards_store.js.es6
@@ -18,7 +18,6 @@
if (persist) {
list.save();
this.removeBlankState();
- this.updateNewListDropdown();
}
return list;
diff --git a/app/assets/javascripts/labels_select.js b/app/assets/javascripts/labels_select.js
index 3977cf15bd2..bee37182d4d 100644
--- a/app/assets/javascripts/labels_select.js
+++ b/app/assets/javascripts/labels_select.js
@@ -304,7 +304,9 @@
isIssueIndex = page === 'projects:issues:index';
isMRIndex = page === 'projects:merge_requests:index';
if (page === 'projects:boards:show') {
- if (label.title) {
+ if (label.isAny) {
+ BoardsStore.state.filters['label_name'] = [];
+ } else if (label.title) {
BoardsStore.state.filters['label_name'].push(label.title);
} else {
var labelIndex = BoardsStore.state.filters['label_name'].indexOf(label.text());