Commit 90960b2f authored by Enrique Alcántara's avatar Enrique Alcántara

Merge branch...

Merge branch '202267-migrate-spinner-for-app/assets/javascripts/vue_merge_request_widget/components/deployment/memory_usage.vue' into 'master'

Migrate '.fa-spinner' to '.spinner' for 'app/.../memory_usage.vue'

Closes #202267

See merge request gitlab-org/gitlab!41142
parents 758db5ef b90b3050
<script> <script>
/* eslint-disable vue/no-v-html */ /* eslint-disable vue/no-v-html */
import { GlLoadingIcon } from '@gitlab/ui';
import { sprintf, s__ } from '~/locale'; import { sprintf, s__ } from '~/locale';
import statusCodes from '~/lib/utils/http_status'; import statusCodes from '~/lib/utils/http_status';
import { bytesToMiB } from '~/lib/utils/number_utils'; import { bytesToMiB } from '~/lib/utils/number_utils';
...@@ -11,6 +12,7 @@ export default { ...@@ -11,6 +12,7 @@ export default {
name: 'MemoryUsage', name: 'MemoryUsage',
components: { components: {
MemoryGraph, MemoryGraph,
GlLoadingIcon,
}, },
props: { props: {
metricsUrl: { metricsUrl: {
...@@ -156,8 +158,9 @@ export default { ...@@ -156,8 +158,9 @@ export default {
<template> <template>
<div class="mr-info-list clearfix mr-memory-usage js-mr-memory-usage"> <div class="mr-info-list clearfix mr-memory-usage js-mr-memory-usage">
<p v-if="shouldShowLoading" class="usage-info js-usage-info usage-info-loading"> <p v-if="shouldShowLoading" class="usage-info js-usage-info usage-info-loading">
<i class="fa fa-spinner fa-spin usage-info-load-spinner" aria-hidden="true"> </i <gl-loading-icon class="usage-info-load-spinner" />{{
>{{ s__('mrWidget|Loading deployment statistics') }} s__('mrWidget|Loading deployment statistics')
}}
</p> </p>
<p <p
v-if="shouldShowMemoryGraph" v-if="shouldShowMemoryGraph"
......
---
title: Migrate '.fa-spinner' to '.spinner' for 'app/assets/javascripts/vue_merge_request_widget/components/deployment/memory_usage.vue'
merge_request: 41142
author: Gilang Gumilar
type: changed
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