Commit 0276568e authored by Ezekiel Kigbo's avatar Ezekiel Kigbo

Merge branch 'replace-GlDepractedBadge-in-environment_header' into 'master'

Replace GlDeprecatedBadge with GlBadge for environment header

See merge request gitlab-org/gitlab!45768
parents d483fa45 1b88754c
---
title: Replaced GlDeprecatedBadge for GlBadge in environment header
merge_request: 45768
author:
type: changed
<script> <script>
import { GlLink, GlDeprecatedBadge as GlBadge, GlTooltipDirective, GlIcon } from '@gitlab/ui'; import { GlLink, GlBadge, GlTooltipDirective, GlIcon } from '@gitlab/ui';
import { s__ } from '~/locale'; import { s__ } from '~/locale';
import ReviewAppLink from '~/vue_merge_request_widget/components/review_app_link.vue'; import ReviewAppLink from '~/vue_merge_request_widget/components/review_app_link.vue';
...@@ -59,7 +59,7 @@ export default { ...@@ -59,7 +59,7 @@ export default {
> >
<span class="js-environment-name bold"> {{ environment.name }}</span> <span class="js-environment-name bold"> {{ environment.name }}</span>
</gl-link> </gl-link>
<gl-badge v-if="environment.within_folder" :pill="true" class="dashboard-card-icon">{{ <gl-badge v-if="environment.within_folder" class="dashboard-card-icon">{{
environment.size environment.size
}}</gl-badge> }}</gl-badge>
</div> </div>
......
...@@ -136,7 +136,8 @@ exports[`Environment Header with environments grouped into a folder matches the ...@@ -136,7 +136,8 @@ exports[`Environment Header with environments grouped into a folder matches the
<gl-badge-stub <gl-badge-stub
class="dashboard-card-icon" class="dashboard-card-icon"
pill="true" size="md"
variant="muted"
> >
5 5
</gl-badge-stub> </gl-badge-stub>
......
import { shallowMount, mount } from '@vue/test-utils'; import { shallowMount, mount } from '@vue/test-utils';
import { GlLink, GlDeprecatedBadge as GlBadge, GlIcon } from '@gitlab/ui'; import { GlLink, GlBadge, GlIcon } from '@gitlab/ui';
import component from 'ee/environments_dashboard/components/dashboard/environment_header.vue'; import component from 'ee/environments_dashboard/components/dashboard/environment_header.vue';
import ReviewAppLink from '~/vue_merge_request_widget/components/review_app_link.vue'; import ReviewAppLink from '~/vue_merge_request_widget/components/review_app_link.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