diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-25 18:08:50 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-25 18:08:50 +0300 |
| commit | e06d0e779673d745972863302858105aad9032e5 (patch) | |
| tree | 0ff35b27a949a164f586613004b4abfe33e7d20e /app/assets/javascripts/notes | |
| parent | f7dae0cdcb70ecb71c1d65f099e9d96b27a4548c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/notes')
| -rw-r--r-- | app/assets/javascripts/notes/components/discussion_resolve_button.vue | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/javascripts/notes/components/discussion_resolve_button.vue b/app/assets/javascripts/notes/components/discussion_resolve_button.vue index 2b29d710236..77f6f1e51c5 100644 --- a/app/assets/javascripts/notes/components/discussion_resolve_button.vue +++ b/app/assets/javascripts/notes/components/discussion_resolve_button.vue @@ -1,6 +1,11 @@ <script> +import { GlLoadingIcon } from '@gitlab/ui'; + export default { name: 'ResolveDiscussionButton', + components: { + GlLoadingIcon, + }, props: { isResolving: { type: Boolean, @@ -17,12 +22,7 @@ export default { <template> <button ref="button" type="button" class="btn btn-default ml-sm-2" @click="$emit('onClick')"> - <i - v-if="isResolving" - ref="isResolvingIcon" - aria-hidden="true" - class="fa fa-spinner fa-spin" - ></i> + <gl-loading-icon v-if="isResolving" ref="isResolvingIcon" inline /> {{ buttonTitle }} </button> </template> |