diff options
| author | winh <winnie@gitlab.com> | 2017-06-13 14:03:04 +0200 |
|---|---|---|
| committer | winh <winnie@gitlab.com> | 2017-06-13 14:03:04 +0200 |
| commit | 65d58ad6359667f098e6d39ff6c5f29a62f21c18 (patch) | |
| tree | 5d571708bcc0f8995fcecaa713ff0a40fd5815d8 | |
| parent | c60d039f031bed2abaf533b4bbe9a7d9850696f4 (diff) | |
| download | gitlab-ce-winh-mr-widget-no-pipeline.tar.gz | |
Handle missing pipeline in merge request widgetwinh-mr-widget-no-pipeline
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.js | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.js b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.js index c02e10128e2..fe390039b54 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.js +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.js @@ -17,6 +17,9 @@ export default { return hasCI && !ciStatus; }, + hasPipeline() { + return Object.keys(this.mr.pipeline || {}).length > 0; + }, svg() { return statusIconEntityMap.icon_status_failed; }, @@ -30,7 +33,11 @@ export default { template: ` <div class="mr-widget-heading"> <div class="ci-widget"> - <template v-if="hasCIError"> + <template v-if="!hasPipeline"> + <i class="fa fa-spinner fa-spin"></i> + Checking CI status... + </template> + <template v-else-if="hasCIError"> <div class="ci-status-icon ci-status-icon-failed ci-error js-ci-error"> <span class="js-icon-link icon-link"> <span |