diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-22 15:08:40 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-22 15:08:40 +0300 |
| commit | be3e24ea3c9f497efde85900df298ce9bc42fce8 (patch) | |
| tree | fd0de9443253a1b21ca9a2741dc34ba3aef795be /app/assets/javascripts/notes/components/discussion_filter_note.vue | |
| parent | 001243986195143c395a9811d8254bbf1b9ebfa1 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/notes/components/discussion_filter_note.vue')
| -rw-r--r-- | app/assets/javascripts/notes/components/discussion_filter_note.vue | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/notes/components/discussion_filter_note.vue b/app/assets/javascripts/notes/components/discussion_filter_note.vue index 889731df180..8dc4b43d69a 100644 --- a/app/assets/javascripts/notes/components/discussion_filter_note.vue +++ b/app/assets/javascripts/notes/components/discussion_filter_note.vue @@ -38,12 +38,12 @@ export default { <icon name="comment" /> </div> <div class="timeline-content"> - <div v-html="timelineContent"></div> + <div ref="timelineContent" v-html="timelineContent"></div> <div class="discussion-filter-actions mt-2"> - <gl-button variant="default" @click="selectFilter(0)"> + <gl-button ref="showAllActivity" variant="default" @click="selectFilter(0)"> {{ __('Show all activity') }} </gl-button> - <gl-button variant="default" @click="selectFilter(1)"> + <gl-button ref="showComments" variant="default" @click="selectFilter(1)"> {{ __('Show comments only') }} </gl-button> </div> |