diff options
author | Heinrich Lee Yu <heinrich@gitlab.com> | 2018-11-22 00:04:28 +0800 |
---|---|---|
committer | Heinrich Lee Yu <heinrich@gitlab.com> | 2018-12-06 09:02:34 +0800 |
commit | f57b1323ffd72607eb72ec670a27cbf572732d96 (patch) | |
tree | d1f8073eb17344a513cf8b5fcf8028d126af966f /app | |
parent | 2dd84abf41d7294cf52f18ce059356f33a12dcdf (diff) | |
download | gitlab-ce-f57b1323ffd72607eb72ec670a27cbf572732d96.tar.gz |
Fix failed tests and add extra test
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/boards/stores/boards_store.js | 4 | ||||
-rw-r--r-- | app/assets/javascripts/labels_select.js | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/app/assets/javascripts/boards/stores/boards_store.js b/app/assets/javascripts/boards/stores/boards_store.js index 01fc1cb5af3..802796208c2 100644 --- a/app/assets/javascripts/boards/stores/boards_store.js +++ b/app/assets/javascripts/boards/stores/boards_store.js @@ -167,9 +167,7 @@ const boardsStore = { return filteredList[0]; }, findListByLabelId(id) { - return this.state.lists.find(list => { - return list.type === 'label' && list.label.id === id; - }); + return this.state.lists.find(list => list.type === 'label' && list.label.id === id); }, updateFiltersUrl() { window.history.pushState(null, null, `?${this.filter.path}`); diff --git a/app/assets/javascripts/labels_select.js b/app/assets/javascripts/labels_select.js index bb0af7de5da..f7a611fbca0 100644 --- a/app/assets/javascripts/labels_select.js +++ b/app/assets/javascripts/labels_select.js @@ -170,7 +170,7 @@ export default class LabelsSelect { axios .get(labelUrl) .then(res => { - let data = res.data; + let { data } = res; if ($dropdown.hasClass('js-extra-options')) { var extraData = []; if (showNo) { @@ -256,7 +256,8 @@ export default class LabelsSelect { } } if (label.color) { - colorEl = "<span class='dropdown-label-box' style='background: " + label.color + "'></span>"; + colorEl = + "<span class='dropdown-label-box' style='background: " + label.color + "'></span>"; } else { colorEl = ''; } |