diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
tree | 78be5963ec075d80116a932011d695dd33910b4e /app/assets/javascripts/boards/index.js | |
parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'app/assets/javascripts/boards/index.js')
-rw-r--r-- | app/assets/javascripts/boards/index.js | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/app/assets/javascripts/boards/index.js b/app/assets/javascripts/boards/index.js index 5b4a1d262dd..971edd71eec 100644 --- a/app/assets/javascripts/boards/index.js +++ b/app/assets/javascripts/boards/index.js @@ -4,7 +4,6 @@ import { mapActions } from 'vuex'; import 'ee_else_ce/boards/models/issue'; import 'ee_else_ce/boards/models/list'; -import BoardContent from '~/boards/components/board_content.vue'; import BoardSidebar from 'ee_else_ce/boards/components/board_sidebar'; import initNewListDropdown from 'ee_else_ce/boards/components/new_list_dropdown'; import boardConfigToggle from 'ee_else_ce/boards/config_toggle'; @@ -19,8 +18,9 @@ import { } from 'ee_else_ce/boards/ee_functions'; import VueApollo from 'vue-apollo'; +import BoardContent from '~/boards/components/board_content.vue'; import createDefaultClient from '~/lib/graphql'; -import Flash from '~/flash'; +import { deprecatedCreateFlash as Flash } from '~/flash'; import { __ } from '~/locale'; import './models/label'; import './models/assignee'; @@ -83,8 +83,7 @@ export default () => { Board: () => import('ee_else_ce/boards/components/board_column.vue'), BoardSidebar, BoardAddIssuesModal, - BoardSettingsSidebar: () => - import('ee_component/boards/components/board_settings_sidebar.vue'), + BoardSettingsSidebar: () => import('~/boards/components/board_settings_sidebar.vue'), }, store, apolloProvider, @@ -118,7 +117,7 @@ export default () => { boardId: this.boardId, fullPath: $boardApp.dataset.fullPath, }; - this.setEndpoints(endpoints); + this.setInitialBoardData({ ...endpoints, boardType: this.parent }); boardsStore.setEndpoints(endpoints); boardsStore.rootPath = this.boardsEndpoint; @@ -190,7 +189,7 @@ export default () => { } }, methods: { - ...mapActions(['setEndpoints']), + ...mapActions(['setInitialBoardData']), updateTokens() { this.filterManager.updateTokens(); }, |