diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-11-16 14:07:38 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-11-20 09:30:01 -0600 |
| commit | 5b9495c5db851ec8d1ca2cc6da0da12d6b161130 (patch) | |
| tree | f622611ceb4caeda70212a52438a2c9428511a68 /app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.vue | |
| parent | 29d129d21718f8aa9c7d58a8b403cf91f6d4addd (diff) | |
| download | gitlab-ce-5b9495c5db851ec8d1ca2cc6da0da12d6b161130.tar.gz | |
Prettify all the things
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.vue')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.vue | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.vue index 060361a6516..780ced4d382 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.vue @@ -33,18 +33,9 @@ export default { </script> <template> <div class="space-children d-flex append-right-10 widget-status-icon"> - <div - v-if="isLoading" - class="mr-widget-icon" - > - <gl-loading-icon /> - </div> + <div v-if="isLoading" class="mr-widget-icon"><gl-loading-icon /></div> - <ci-icon - v-else - :status="statusObj" - :size="24" - /> + <ci-icon v-else :status="statusObj" :size="24" /> <button v-if="showDisabledButton" @@ -52,7 +43,7 @@ export default { class="js-disabled-merge-button btn btn-success btn-sm" disabled="true" > - {{ s__("mrWidget|Merge") }} + {{ s__('mrWidget|Merge') }} </button> </div> </template> |