diff options
author | Kushal Pandya <kushalspandya@gmail.com> | 2019-02-26 14:04:15 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-02-26 14:04:15 +0000 |
commit | 2dd22ecb4601b546b630d1bdd7203dc4d87959e7 (patch) | |
tree | 1406c773cbcc47482db44f592ab51d9010f62c7d /app/assets/javascripts/notes/components/notes_app.vue | |
parent | 8baf9e5f03ea1388d7c65a1f6f1d7eb9cc952611 (diff) | |
download | gitlab-ce-2dd22ecb4601b546b630d1bdd7203dc4d87959e7.tar.gz |
Add support for toggling discussion filter from notes section
Adds discussion note style section under notes app from where
user can toggle discussion when they have selected a filter to show
only system notes.
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 8d3f6d902f8..e2bd59f7631 100644 --- a/app/assets/javascripts/notes/components/notes_app.vue +++ b/app/assets/javascripts/notes/components/notes_app.vue @@ -6,6 +6,7 @@ import * as constants from '../constants'; import eventHub from '../event_hub'; import noteableNote from './noteable_note.vue'; import noteableDiscussion from './noteable_discussion.vue'; +import discussionFilterNote from './discussion_filter_note.vue'; import systemNote from '../../vue_shared/components/notes/system_note.vue'; import commentForm from './comment_form.vue'; import placeholderNote from '../../vue_shared/components/notes/placeholder_note.vue'; @@ -24,6 +25,7 @@ export default { placeholderNote, placeholderSystemNote, skeletonLoadingContainer, + discussionFilterNote, }, props: { noteableData: { @@ -235,6 +237,7 @@ export default { :help-page-path="helpPagePath" /> </template> + <discussion-filter-note v-show="commentsDisabled" /> </ul> <comment-form v-if="!commentsDisabled" :noteable-type="noteableType" /> |