Commit 56fe59c2 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch...

Merge branch '202270-migrate-spinner-for-app/assets/javascripts/notes/components/note_header.vue' into 'master'

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

Closes #202270

See merge request gitlab-org/gitlab!41140
parents ad728ffc beab488d
<script> <script>
/* eslint-disable vue/no-v-html */ /* eslint-disable vue/no-v-html */
import { mapActions } from 'vuex'; import { mapActions } from 'vuex';
import { GlIcon, GlTooltipDirective } from '@gitlab/ui'; import { GlIcon, GlLoadingIcon, GlTooltipDirective } from '@gitlab/ui';
import timeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import timeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
export default { export default {
...@@ -10,6 +10,7 @@ export default { ...@@ -10,6 +10,7 @@ export default {
GitlabTeamMemberBadge: () => GitlabTeamMemberBadge: () =>
import('ee_component/vue_shared/components/user_avatar/badges/gitlab_team_member_badge.vue'), import('ee_component/vue_shared/components/user_avatar/badges/gitlab_team_member_badge.vue'),
GlIcon, GlIcon,
GlLoadingIcon,
}, },
directives: { directives: {
GlTooltip: GlTooltipDirective, GlTooltip: GlTooltipDirective,
...@@ -195,13 +196,12 @@ export default { ...@@ -195,13 +196,12 @@ export default {
class="gl-ml-1 gl-text-gray-700 align-middle" class="gl-ml-1 gl-text-gray-700 align-middle"
/> />
<slot name="extra-controls"></slot> <slot name="extra-controls"></slot>
<i <gl-loading-icon
v-if="showSpinner" v-if="showSpinner"
ref="spinner" ref="spinner"
class="fa fa-spinner fa-spin editing-spinner" class="editing-spinner"
:aria-label="__('Comment is being updated')" :label="__('Comment is being updated')"
aria-hidden="true" />
></i>
</span> </span>
</div> </div>
</template> </template>
---
title: Migrate '.fa-spinner' to '.spinner' for 'app/assets/javascripts/notes/components/note_header.vue'
merge_request: 41140
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