summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-08-15 08:36:37 +0100
committerPhil Hughes <me@iamphill.com>2016-08-17 17:17:39 +0100
commit5c7fd643a6043dddc6479fe9bd75b49754cbb098 (patch)
treeaf803cf8d8c7c372ff413d224e96e74662ad87b4 /app/assets
parenta996eecc37c0164178326efbf20f3734f12f5058 (diff)
downloadgitlab-ce-5c7fd643a6043dddc6479fe9bd75b49754cbb098.tar.gz
Fixed blank state nevermind button
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/boards/components/board_blank_state.js.es63
-rw-r--r--app/assets/javascripts/boards/stores/boards_store.js.es62
2 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/javascripts/boards/components/board_blank_state.js.es6 b/app/assets/javascripts/boards/components/board_blank_state.js.es6
index 7c3f4073089..31f416c4dae 100644
--- a/app/assets/javascripts/boards/components/board_blank_state.js.es6
+++ b/app/assets/javascripts/boards/components/board_blank_state.js.es6
@@ -11,8 +11,7 @@
}
},
methods: {
- addDefaultLists (e) {
- e.stopImmediatePropagation();
+ addDefaultLists () {
BoardsStore.removeBlankState();
for (let i = 0, labelsLength = this.predefinedLabels.length; i < labelsLength; i++) {
diff --git a/app/assets/javascripts/boards/stores/boards_store.js.es6 b/app/assets/javascripts/boards/stores/boards_store.js.es6
index bc330ba9507..cddedb35509 100644
--- a/app/assets/javascripts/boards/stores/boards_store.js.es6
+++ b/app/assets/javascripts/boards/stores/boards_store.js.es6
@@ -65,7 +65,7 @@
return $.cookie('issue_board_welcome_hidden') === 'true';
},
removeList (id) {
- const list = this.findList('id', id);
+ const list = this.findList('id', id, 'blank');
if (!list) return;