diff options
| author | Phil Hughes <me@iamphill.com> | 2017-07-06 13:14:33 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-07-06 13:14:33 +0000 |
| commit | bb918a2fd98136c232baa34104c357f3716f8842 (patch) | |
| tree | e6f66f4c639685934fa4bda8c95057dba22d41f6 /app | |
| parent | ec3b10e078de03ac32ef85872d3d1518ef8526d5 (diff) | |
| parent | 9786e4fb0a35f65b48c0f13b66783fb8bb8f8bc8 (diff) | |
| download | gitlab-ce-bb918a2fd98136c232baa34104c357f3716f8842.tar.gz | |
Merge branch 'revert-018f7e46' into 'master'
Revert "Merge branch 'winh-mr-widget-no-pipeline' into 'master'"
See merge request !12674
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.js | 9 |
1 files changed, 1 insertions, 8 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 e8b3cf2f729..c02e10128e2 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,9 +17,6 @@ export default { return hasCI && !ciStatus; }, - hasPipeline() { - return Object.keys(this.mr.pipeline || {}).length > 0; - }, svg() { return statusIconEntityMap.icon_status_failed; }, @@ -33,11 +30,7 @@ export default { template: ` <div class="mr-widget-heading"> <div class="ci-widget"> - <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"> + <template v-if="hasCIError"> <div class="ci-status-icon ci-status-icon-failed ci-error js-ci-error"> <span class="js-icon-link icon-link"> <span |