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-11-24 12:10:01 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-11-24 12:10:01 +0300
commitaab5db568e1090b5a9ae9cec6d788f88ac6faa4c (patch)
treef7b0790fef29dd522ec7f19a358d146a6bfec385 /app/assets/javascripts/super_sidebar
parent3d1f123313fc350f217081c6ccf38169420bf92d (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/extra_info.vue7
-rw-r--r--app/assets/javascripts/super_sidebar/components/super_sidebar.vue3
2 files changed, 10 insertions, 0 deletions
diff --git a/app/assets/javascripts/super_sidebar/components/extra_info.vue b/app/assets/javascripts/super_sidebar/components/extra_info.vue
new file mode 100644
index 00000000000..23340f1190f
--- /dev/null
+++ b/app/assets/javascripts/super_sidebar/components/extra_info.vue
@@ -0,0 +1,7 @@
+<script>
+export default {};
+</script>
+<template>
+ <!-- This is intentionally left blank -->
+ <div></div>
+</template>
diff --git a/app/assets/javascripts/super_sidebar/components/super_sidebar.vue b/app/assets/javascripts/super_sidebar/components/super_sidebar.vue
index ebdc0026539..52015484cb5 100644
--- a/app/assets/javascripts/super_sidebar/components/super_sidebar.vue
+++ b/app/assets/javascripts/super_sidebar/components/super_sidebar.vue
@@ -1,6 +1,7 @@
<script>
import { GlButton } from '@gitlab/ui';
import { GlBreakpointInstance, breakpoints } from '@gitlab/ui/dist/utils';
+import ExtraInfo from 'jh_else_ce/super_sidebar/components/extra_info.vue';
import { Mousetrap } from '~/lib/mousetrap';
import { TAB_KEY_CODE } from '~/lib/utils/keycodes';
import { keysFor, TOGGLE_SUPER_SIDEBAR } from '~/behaviors/shortcuts/keybindings';
@@ -27,6 +28,7 @@ export default {
GlButton,
UserBar,
HelpCenter,
+ ExtraInfo,
SidebarMenu,
SidebarPeekBehavior,
SidebarHoverPeekBehavior,
@@ -233,6 +235,7 @@ export default {
>
{{ $options.i18n.adminArea }}
</gl-button>
+ <extra-info />
</div>
</div>
</nav>