Commit 8c878467 authored by Andrew Fontaine's avatar Andrew Fontaine

Merge branch 'Replace-gl-deprecated-badge-in-s-dashboard-project-list' into 'master'

Replace GlDeprecatedBadge in Security Dashboard Project List

See merge request gitlab-org/gitlab!45917
parents 62336b19 2675b28e
<script> <script>
import { import { GlBadge, GlButton, GlLoadingIcon, GlTooltipDirective } from '@gitlab/ui';
GlDeprecatedBadge as GlBadge,
GlButton,
GlLoadingIcon,
GlTooltipDirective,
} from '@gitlab/ui';
import ProjectAvatar from '~/vue_shared/components/project_avatar/default.vue'; import ProjectAvatar from '~/vue_shared/components/project_avatar/default.vue';
export default { export default {
...@@ -40,7 +35,7 @@ export default { ...@@ -40,7 +35,7 @@ export default {
<div> <div>
<h4 class="h5 font-weight-bold text-secondary border-bottom mb-3 pb-2"> <h4 class="h5 font-weight-bold text-secondary border-bottom mb-3 pb-2">
{{ s__('SecurityReports|Projects added') }} {{ s__('SecurityReports|Projects added') }}
<gl-badge pill class="font-weight-bold">{{ projects.length }}</gl-badge> <gl-badge class="gl-font-weight-bold">{{ projects.length }}</gl-badge>
<gl-loading-icon v-if="showLoadingIndicator" size="sm" class="float-right" /> <gl-loading-icon v-if="showLoadingIndicator" size="sm" class="float-right" />
</h4> </h4>
<ul v-if="projects.length" class="list-unstyled"> <ul v-if="projects.length" class="list-unstyled">
......
---
title: Replaced GlDeprecatedBadge with GlBadge for Security Dashboard Project List
merge_request: 45917
author:
type: changed
import { shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import { GlDeprecatedBadge as GlBadge, GlButton, GlLoadingIcon } from '@gitlab/ui'; import { GlBadge, GlButton, GlLoadingIcon } from '@gitlab/ui';
import ProjectList from 'ee/security_dashboard/components/first_class_project_manager/project_list.vue'; import ProjectList from 'ee/security_dashboard/components/first_class_project_manager/project_list.vue';
import ProjectAvatar from '~/vue_shared/components/project_avatar/default.vue'; import ProjectAvatar from '~/vue_shared/components/project_avatar/default.vue';
......
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