diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-25 03:09:12 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-25 03:09:12 +0300 |
| commit | 0b881f91159cc97ccb7328a2e52977a60ea83fbe (patch) | |
| tree | d6b683cb935112aee47121f46e3c5dc84de24f2c /app/assets/javascripts/vue_shared | |
| parent | 7671216b60e2796a050358ff808b4a0c2de3d22f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared')
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_title.vue | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_title.vue b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_title.vue index 574b63cf8a6..69fb2bb4524 100644 --- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_title.vue +++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_title.vue @@ -1,5 +1,10 @@ <script> +import { GlLoadingIcon } from '@gitlab/ui'; + export default { + components: { + GlLoadingIcon, + }, props: { canEdit: { type: Boolean, @@ -13,7 +18,7 @@ export default { <div class="title hide-collapsed append-bottom-10"> {{ __('Labels') }} <template v-if="canEdit"> - <i aria-hidden="true" class="fa fa-spinner fa-spin block-loading" data-hidden="true"> </i> + <gl-loading-icon inline class="align-text-top block-loading" /> <button type="button" class="edit-link btn btn-blank float-right js-sidebar-dropdown-toggle" |