summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/boards
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-17 12:08:11 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-17 12:08:11 +0000
commitbadb9c1deacbea601b02f88811b7e123589d9251 (patch)
treef4b4f85db49a8c9fc9bd6233ed9f7862c9de8ded /app/assets/javascripts/boards
parent5bd24a54ef4ce3a38a860eb53b66d062c2382971 (diff)
downloadgitlab-ce-badb9c1deacbea601b02f88811b7e123589d9251.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/boards')
-rw-r--r--app/assets/javascripts/boards/index.js2
-rw-r--r--app/assets/javascripts/boards/stores/state.js1
2 files changed, 3 insertions, 0 deletions
diff --git a/app/assets/javascripts/boards/index.js b/app/assets/javascripts/boards/index.js
index 0d10c896a47..f1b481fc386 100644
--- a/app/assets/javascripts/boards/index.js
+++ b/app/assets/javascripts/boards/index.js
@@ -68,6 +68,8 @@ export default () => {
Board,
BoardSidebar,
BoardAddIssuesModal,
+ BoardSettingsSidebar: () =>
+ import('ee_component/boards/components/board_settings_sidebar.vue'),
},
store,
data: {
diff --git a/app/assets/javascripts/boards/stores/state.js b/app/assets/javascripts/boards/stores/state.js
index 24f44dc5629..731aea996fb 100644
--- a/app/assets/javascripts/boards/stores/state.js
+++ b/app/assets/javascripts/boards/stores/state.js
@@ -1,3 +1,4 @@
export default () => ({
isShowingLabels: true,
+ activeListId: 0,
});