Commit c31c2e5c authored by Olena Horal-Koretska's avatar Olena Horal-Koretska

Merge branch 'replace-GlDeprecated-Badge-for-GlBadge-in-requirements-tabs' into 'master'

Replace GLDeprecatedBadge with GlBadge

See merge request gitlab-org/gitlab!45647
parents 2b8072a2 5da18f2a
---
title: Replaced GlDeprecatedBadge for GlBadge in requirements tabs
merge_request: 45647
author:
type: changed
<script> <script>
import { GlLink, GlDeprecatedBadge as GlBadge, GlButton } from '@gitlab/ui'; import { GlLink, GlBadge, GlButton } from '@gitlab/ui';
import { FilterState } from '../constants'; import { FilterState } from '../constants';
...@@ -53,7 +53,7 @@ export default { ...@@ -53,7 +53,7 @@ export default {
@click="$emit('click-tab', { filterBy: $options.FilterState.opened })" @click="$emit('click-tab', { filterBy: $options.FilterState.opened })"
> >
{{ __('Open') }} {{ __('Open') }}
<gl-badge class="badge-pill">{{ requirementsCount.OPENED }}</gl-badge> <gl-badge>{{ requirementsCount.OPENED }}</gl-badge>
</gl-link> </gl-link>
</li> </li>
<li :class="{ active: isArchivedTab }"> <li :class="{ active: isArchivedTab }">
...@@ -64,7 +64,7 @@ export default { ...@@ -64,7 +64,7 @@ export default {
@click="$emit('click-tab', { filterBy: $options.FilterState.archived })" @click="$emit('click-tab', { filterBy: $options.FilterState.archived })"
> >
{{ __('Archived') }} {{ __('Archived') }}
<gl-badge class="badge-pill">{{ requirementsCount.ARCHIVED }}</gl-badge> <gl-badge>{{ requirementsCount.ARCHIVED }}</gl-badge>
</gl-link> </gl-link>
</li> </li>
<li :class="{ active: isAllTab }"> <li :class="{ active: isAllTab }">
...@@ -75,7 +75,7 @@ export default { ...@@ -75,7 +75,7 @@ export default {
@click="$emit('click-tab', { filterBy: $options.FilterState.all })" @click="$emit('click-tab', { filterBy: $options.FilterState.all })"
> >
{{ __('All') }} {{ __('All') }}
<gl-badge class="badge-pill">{{ requirementsCount.ALL }}</gl-badge> <gl-badge>{{ requirementsCount.ALL }}</gl-badge>
</gl-link> </gl-link>
</li> </li>
</ul> </ul>
......
import { shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import { GlLink, GlDeprecatedBadge as GlBadge, GlButton } from '@gitlab/ui'; import { GlLink, GlBadge, GlButton } from '@gitlab/ui';
import RequirementsTabs from 'ee/requirements/components/requirements_tabs.vue'; import RequirementsTabs from 'ee/requirements/components/requirements_tabs.vue';
import { FilterState } from 'ee/requirements/constants'; import { FilterState } from 'ee/requirements/constants';
......
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