Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-09-28 15:08:02 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-09-28 15:08:02 +0300
commit5573dc288d880386a96afc9458f7d1abd6cd745f (patch)
treefb3ec81501f337b71b10e35285e56654c9c9ab52 /app/assets/javascripts/super_sidebar
parent1e16ecd8e2fd4b23ee56519072d245d261ea2804 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/super_sidebar')
-rw-r--r--app/assets/javascripts/super_sidebar/components/sidebar_menu.vue5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/super_sidebar/components/sidebar_menu.vue b/app/assets/javascripts/super_sidebar/components/sidebar_menu.vue
index 772072c0996..6f9a086aff4 100644
--- a/app/assets/javascripts/super_sidebar/components/sidebar_menu.vue
+++ b/app/assets/javascripts/super_sidebar/components/sidebar_menu.vue
@@ -21,7 +21,10 @@ export default {
return {
pinnedItemIds: this.changedPinnedItemIds,
panelSupportsPins: this.supportsPins,
- panelType: this.panelType,
+ // We can't use this.panelType due to bug in vue-apollo when
+ // provide is called in beforeCreate
+ // See https://github.com/vuejs/vue-apollo/pull/1153 for details
+ panelType: this.$options.propsData.panelType,
};
},
props: {