diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-07 12:08:35 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-07 12:08:35 +0300 |
| commit | 6b8af95df6c5702343c32ae266b0eb35e06d0546 (patch) | |
| tree | 400c0cf36de7be6737ed18d537f8c74e69b604cd /app/assets/javascripts/badges | |
| parent | 7c33a59ac3b716b38baffbfe5c7f15e8104f3c6f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/badges')
| -rw-r--r-- | app/assets/javascripts/badges/components/badge.vue | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/badges/components/badge_form.vue | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/badges/components/badge_list_row.vue | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/badges/components/badge.vue b/app/assets/javascripts/badges/components/badge.vue index 309af368df9..53469ac8999 100644 --- a/app/assets/javascripts/badges/components/badge.vue +++ b/app/assets/javascripts/badges/components/badge.vue @@ -84,7 +84,7 @@ export default { /> </a> - <gl-loading-icon v-show="isLoading" :inline="true" /> + <gl-loading-icon v-show="isLoading" size="sm" :inline="true" /> <div v-show="hasError" class="btn-group"> <div class="btn btn-default btn-sm disabled"> diff --git a/app/assets/javascripts/badges/components/badge_form.vue b/app/assets/javascripts/badges/components/badge_form.vue index 7c4ff830a9d..7e605099655 100644 --- a/app/assets/javascripts/badges/components/badge_form.vue +++ b/app/assets/javascripts/badges/components/badge_form.vue @@ -221,7 +221,7 @@ export default { :link-url="renderedLinkUrl" /> <p v-show="isRendering"> - <gl-loading-icon :inline="true" /> + <gl-loading-icon size="sm" :inline="true" /> </p> <p v-show="!renderedBadge && !isRendering" class="disabled-content"> {{ s__('Badges|No image to preview') }} diff --git a/app/assets/javascripts/badges/components/badge_list_row.vue b/app/assets/javascripts/badges/components/badge_list_row.vue index fda51c98e2c..d8525c15087 100644 --- a/app/assets/javascripts/badges/components/badge_list_row.vue +++ b/app/assets/javascripts/badges/components/badge_list_row.vue @@ -73,7 +73,7 @@ export default { data-testid="delete-badge" @click="updateBadgeInModal(badge)" /> - <gl-loading-icon v-show="badge.isDeleting" :inline="true" /> + <gl-loading-icon v-show="badge.isDeleting" size="sm" :inline="true" /> </div> </div> </div> |