diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-01 18:10:05 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-01 18:10:05 +0300 |
commit | d57e27ef353787dac501d6970c546c9d86dd1f88 (patch) | |
tree | 89044194e81f95aaa15ace8a5d6a5b429179965f /app/assets/javascripts/sidebar | |
parent | a27b8a5c104f492e4b0abac4c84385a615c4f6ba (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/sidebar')
-rw-r--r-- | app/assets/javascripts/sidebar/mount_sidebar.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/sidebar/mount_sidebar.js b/app/assets/javascripts/sidebar/mount_sidebar.js index ffc7f2c07ba..a25a7b0b2fe 100644 --- a/app/assets/javascripts/sidebar/mount_sidebar.js +++ b/app/assets/javascripts/sidebar/mount_sidebar.js @@ -14,7 +14,7 @@ import sidebarSubscriptions from './components/subscriptions/sidebar_subscriptio import SidebarSeverity from './components/severity/sidebar_severity.vue'; import Translate from '../vue_shared/translate'; import createDefaultClient from '~/lib/graphql'; -import { isInIssuePage, parseBoolean } from '~/lib/utils/common_utils'; +import { isInIssuePage, isInIncidentPage, parseBoolean } from '~/lib/utils/common_utils'; import createFlash from '~/flash'; import { __ } from '~/locale'; import labelsSelectModule from '~/vue_shared/components/sidebar/labels_select_vue/store'; @@ -51,7 +51,7 @@ function mountAssigneesComponent(mediator) { projectPath: fullPath, field: el.dataset.field, signedIn: el.hasAttribute('data-signed-in'), - issuableType: isInIssuePage() ? 'issue' : 'merge_request', + issuableType: isInIssuePage() || isInIncidentPage() ? 'issue' : 'merge_request', }, }), }); @@ -158,7 +158,7 @@ function mountLockComponent() { const initialData = JSON.parse(dataNode.innerHTML); let importStore; - if (isInIssuePage()) { + if (isInIssuePage() || isInIncidentPage()) { importStore = import(/* webpackChunkName: 'notesStore' */ '~/notes/stores').then( ({ store }) => store, ); |