diff options
| author | winh <winnie@gitlab.com> | 2017-06-13 15:03:04 +0300 |
|---|---|---|
| committer | winh <winnie@gitlab.com> | 2017-06-26 18:43:29 +0300 |
| commit | 50fffb5ff6838f723df43884eeb5ead798e97453 (patch) | |
| tree | f5e02259fda4d5ac843c5d033f98a9e2aafeb185 | |
| parent | 07742c02545c6ed725779e91fef73a96974be0b1 (diff) | |
Handle missing pipeline in merge request widget
| -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..e8b3cf2f729 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 append-right-10" aria-hidden="true"></i> + Waiting for pipeline... + </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 |