diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2018-06-15 13:11:31 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2018-06-15 13:11:31 +0900 |
| commit | 03495dd0cff7510273119c863a1b774d1896af32 (patch) | |
| tree | d315ef16e41e65cc0ff095cf73f849e5146b0028 /app/assets/javascripts/commit/pipelines/pipelines_table.vue | |
| parent | d7a3180d06e7b16728d4f23b1e68007c9c2f3b9a (diff) | |
| parent | fb08183e63733dd7845a16d9f827a5cd5f2d9080 (diff) | |
| download | gitlab-ce-03495dd0cff7510273119c863a1b774d1896af32.tar.gz | |
Merge branch 'master' into build-chunks-on-object-storage
Diffstat (limited to 'app/assets/javascripts/commit/pipelines/pipelines_table.vue')
| -rw-r--r-- | app/assets/javascripts/commit/pipelines/pipelines_table.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/commit/pipelines/pipelines_table.vue b/app/assets/javascripts/commit/pipelines/pipelines_table.vue index 24d63b99a29..95c4be64d35 100644 --- a/app/assets/javascripts/commit/pipelines/pipelines_table.vue +++ b/app/assets/javascripts/commit/pipelines/pipelines_table.vue @@ -77,9 +77,9 @@ <div class="content-list pipelines"> <loading-icon + v-if="isLoading" :label="s__('Pipelines|Loading Pipelines')" size="3" - v-if="isLoading" class="prepend-top-20" /> @@ -91,8 +91,8 @@ /> <div - class="table-holder" v-else-if="shouldRenderTable" + class="table-holder" > <pipelines-table-component :pipelines="state.pipelines" |