diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-14 18:09:32 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-14 18:09:32 +0300 |
commit | 739467f1fa4d5d4042b47ff6637a567d1ad6a4a4 (patch) | |
tree | e9b13550a7f6373c8580b7a0eda499ad2bb9e81d /app/assets/javascripts/sidebar | |
parent | fd27e4f95b3ea8668e1e67f5a88dfb061909c893 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/sidebar')
-rw-r--r-- | app/assets/javascripts/sidebar/components/attention_requested_toggle.vue | 5 | ||||
-rw-r--r-- | app/assets/javascripts/sidebar/sidebar_bundle.js | 12 |
2 files changed, 15 insertions, 2 deletions
diff --git a/app/assets/javascripts/sidebar/components/attention_requested_toggle.vue b/app/assets/javascripts/sidebar/components/attention_requested_toggle.vue index d11bed4f058..6ba88939373 100644 --- a/app/assets/javascripts/sidebar/components/attention_requested_toggle.vue +++ b/app/assets/javascripts/sidebar/components/attention_requested_toggle.vue @@ -70,7 +70,10 @@ export default { </script> <template> - <span v-gl-tooltip.left.viewport="tooltipTitle" class="gl-display-inline-block"> + <span + v-gl-tooltip.left.viewport="tooltipTitle" + class="gl-display-inline-block js-attention-request-toggle" + > <gl-button :loading="loading" :variant="user.attention_requested ? 'warning' : 'default'" diff --git a/app/assets/javascripts/sidebar/sidebar_bundle.js b/app/assets/javascripts/sidebar/sidebar_bundle.js index 1be670f7590..74ab65e4e04 100644 --- a/app/assets/javascripts/sidebar/sidebar_bundle.js +++ b/app/assets/javascripts/sidebar/sidebar_bundle.js @@ -3,7 +3,17 @@ import Mediator from './sidebar_mediator'; export default (store) => { const mediator = new Mediator(getSidebarOptions()); - mediator.fetch(); + mediator + .fetch() + .then(() => { + if (window.gon?.features?.mrAttentionRequests) { + return import('~/attention_requests'); + } + + return null; + }) + .then((module) => module?.initSideNavPopover()) + .catch(() => {}); mountSidebar(mediator, store); }; |