diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 18:18:33 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 18:18:33 +0000 |
| commit | f64a639bcfa1fc2bc89ca7db268f594306edfd7c (patch) | |
| tree | a2c3c2ebcc3b45e596949db485d6ed18ffaacfa1 /app/assets/javascripts/notes/components/notes_app.vue | |
| parent | bfbc3e0d6583ea1a91f627528bedc3d65ba4b10f (diff) | |
| download | gitlab-ce-f64a639bcfa1fc2bc89ca7db268f594306edfd7c.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40
Diffstat (limited to 'app/assets/javascripts/notes/components/notes_app.vue')
| -rw-r--r-- | app/assets/javascripts/notes/components/notes_app.vue | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/assets/javascripts/notes/components/notes_app.vue b/app/assets/javascripts/notes/components/notes_app.vue index 2d66e0d24e3..58cfd150659 100644 --- a/app/assets/javascripts/notes/components/notes_app.vue +++ b/app/assets/javascripts/notes/components/notes_app.vue @@ -17,6 +17,7 @@ import commentForm from './comment_form.vue'; import discussionFilterNote from './discussion_filter_note.vue'; import noteableDiscussion from './noteable_discussion.vue'; import noteableNote from './noteable_note.vue'; +import SidebarSubscription from './sidebar_subscription.vue'; export default { name: 'NotesApp', @@ -30,6 +31,7 @@ export default { skeletonLoadingContainer, discussionFilterNote, OrderedLayout, + SidebarSubscription, }, mixins: [glFeatureFlagsMixin()], props: { @@ -261,6 +263,7 @@ export default { <template> <div v-show="shouldShow" id="notes"> + <sidebar-subscription :iid="noteableData.iid" :noteable-data="noteableData" /> <ordered-layout :slot-keys="slotKeys"> <template #form> <comment-form |