Commit dadf02e5 authored by Enrique Alcántara's avatar Enrique Alcántara

Merge branch '219844-discussion-filter-btn' into 'master'

WIP Convert deprecated buttons to glButtons in discussion_filter_note.vue

Closes #219844

See merge request gitlab-org/gitlab!39152
parents e23d083f d7db0aaf
<script> <script>
import { GlDeprecatedButton } from '@gitlab/ui'; import { GlButton } from '@gitlab/ui';
import Icon from '~/vue_shared/components/icon.vue'; import Icon from '~/vue_shared/components/icon.vue';
import { __, sprintf } from '~/locale'; import { __, sprintf } from '~/locale';
...@@ -7,7 +7,7 @@ import notesEventHub from '../event_hub'; ...@@ -7,7 +7,7 @@ import notesEventHub from '../event_hub';
export default { export default {
components: { components: {
GlDeprecatedButton, GlButton,
Icon, Icon,
}, },
computed: { computed: {
...@@ -40,12 +40,12 @@ export default { ...@@ -40,12 +40,12 @@ export default {
<div class="timeline-content"> <div class="timeline-content">
<div ref="timelineContent" v-html="timelineContent"></div> <div ref="timelineContent" v-html="timelineContent"></div>
<div class="discussion-filter-actions mt-2"> <div class="discussion-filter-actions mt-2">
<gl-deprecated-button ref="showAllActivity" variant="default" @click="selectFilter(0)"> <gl-button ref="showAllActivity" variant="default" @click="selectFilter(0)">
{{ __('Show all activity') }} {{ __('Show all activity') }}
</gl-deprecated-button> </gl-button>
<gl-deprecated-button ref="showComments" variant="default" @click="selectFilter(1)"> <gl-button ref="showComments" variant="default" @click="selectFilter(1)">
{{ __('Show comments only') }} {{ __('Show comments only') }}
</gl-deprecated-button> </gl-button>
</div> </div>
</div> </div>
</li> </li>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment