diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-03-21 16:09:09 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-03-21 16:09:09 +0000 |
| commit | cfe2e6b7a3fdc85637191b0c0a42ac28a6b667aa (patch) | |
| tree | 2c99b893a14b8a65b50a1d0862bf928632ff3912 /app/assets/javascripts/commit | |
| parent | d34d27183a22b7992c91f050b913387a4f7d7186 (diff) | |
| download | gitlab-ce-cfe2e6b7a3fdc85637191b0c0a42ac28a6b667aa.tar.gz | |
Fix loading being shown at the same time at the empty states
Diffstat (limited to 'app/assets/javascripts/commit')
| -rw-r--r-- | app/assets/javascripts/commit/pipelines/pipelines_table.js | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/app/assets/javascripts/commit/pipelines/pipelines_table.js b/app/assets/javascripts/commit/pipelines/pipelines_table.js index f2c2524908d..7cc82b50d43 100644 --- a/app/assets/javascripts/commit/pipelines/pipelines_table.js +++ b/app/assets/javascripts/commit/pipelines/pipelines_table.js @@ -1,5 +1,3 @@ -/* eslint-disable no-new*/ -/* global Flash */ import Vue from 'vue'; import PipelinesTableComponent from '../../vue_shared/components/pipelines_table'; import PipelinesService from '../../vue_pipelines_index/services/pipelines_service'; @@ -50,11 +48,11 @@ export default Vue.component('pipelines-table', { computed: { shouldRenderErrorState() { - return this.hasError && !this.pageRequest; + return this.hasError && !this.isLoading; }, shouldRenderEmptyState() { - return !this.state.pipelines.length && !this.pageRequest; + return !this.state.pipelines.length && !this.isLoading; }, }, @@ -98,7 +96,6 @@ export default Vue.component('pipelines-table', { .catch(() => { this.hasError = true; this.isLoading = false; - new Flash('An error occurred while fetching the pipelines, please reload the page again.'); }); }, }, |